fixes for php 8.4 deprecations

Author: cseufert

php/hamle/Exception/ParseError.php

@@ -34,7 +34,7 @@ class ParseError extends Hamle\Exception
   function __construct(
     string $message = '',
     int $code = 0,
-    Throwable $previous = null
+    ?Throwable $previous = null
   ) {
     ///@todo  Include Line number & file name within parse error exceptions
     $message .= ', on line ' . Hamle\Hamle::getLineNo() . ' in file ?.hamle';

php/hamle/Hamle.php

@@ -121,7 +121,7 @@ function initSnipFiles(): void
    * @throws Exception\NotFound If tempalte file cannot be found
    * @return Hamle Returns instance for chaining commands
    */
-  function load($hamleFile, \Closure $parseFunc = null)
+  function load($hamleFile, ?\Closure $parseFunc = null)
   {
     $template = $this->setup->templatePath($hamleFile);
     if (!file_exists($template)) {
@@ -152,7 +152,7 @@ function load($hamleFile, \Closure $parseFunc = null)
    * @param string $hamleCode Hamle Template as string
    * @throws Exception\ParseError if unable to write to the cache file
    */
-  function parse($hamleCode, \Closure $parseFunc = null): void
+  function parse($hamleCode, ?\Closure $parseFunc = null): void
   {
     if (!$this->cacheFile) {
       $this->cacheFile = $this->setup->cachePath('string.hamle.php');

php/hamle/Scope.php

@@ -20,7 +20,7 @@ class Scope
   /** @var null|Callable */
   static $scopeHook;
 
-  static function add(Model $model, string $name = null): void
+  static function add(Model $model, ?string $name = null): void
   {
     if (!$model instanceof Model) {
       throw new Unsupported(

php/hamle/Tag/Control.php

@@ -47,7 +47,7 @@ class Control extends H\Tag
    * @param \Seufert\Hamle\Tag $parentTag
    * @throws ParseError
    */
-  function __construct(string $tag, H\Tag $parentTag = null)
+  function __construct(string $tag, ?H\Tag $parentTag = null)
   {
     parent::__construct();
     $this->o = "\$o" . self::$instCount++;

php/hamle/Text/Complex.php

@@ -86,7 +86,7 @@ function toPHPVar(): string
     }
   }
 
-  function getOrCreateModel(Model $parent = null): Model
+  function getOrCreateModel(?Model $parent = null): Model
   {
     if ($this->func instanceof Text\Scope) {
       return $this->func->getOrCreateModel($parent);

php/hamle/Text/Func.php

@@ -172,7 +172,7 @@ public function toPHP(): string
    * @param Model|null $parent
    * @return Model
    */
-  public function getOrCreateModel(Model $parent = null): Model
+  public function getOrCreateModel(?Model $parent = null): Model
   {
     if ($this->scope instanceof Scope) {
       $parent = $this->scope->getOrCreateModel();

php/hamle/Text/FuncSub.php

@@ -86,7 +86,7 @@ public function toPHP(): string
       ",$limit)$sub";
   }
 
-  public function getOrCreateModel(Model $parent = null): Model
+  public function getOrCreateModel(?Model $parent = null): Model
   {
     if (!$parent) {
       throw new \RuntimeException('Unable to create when no model is passed');

php/hamle/Text/Scope.php

@@ -66,7 +66,7 @@ function setValue(mixed $value): WriteModel
     throw new \Exception('Unsupported');
   }
 
-  function getOrCreateModel(Model $parent = null): Model
+  function getOrCreateModel(?Model $parent = null): Model
   {
     if (is_int($this->scope)) {
       return \Seufert\Hamle\Scope::get($this->scope);

php/hamle/Text/SimpleVar.php

@@ -63,7 +63,7 @@ function toPHPVar(): string
     return 'Hamle\\Scope::get()->hamleGet(' . Text::varToCode($this->var) . ')';
   }
 
-  function getOrCreateModel(Model $parent = null): Model
+  function getOrCreateModel(?Model $parent = null): Model
   {
     return \Seufert\Hamle\Scope::get()->current();
   }

php/hamle/TextNode/FilterFunc.php

@@ -16,7 +16,7 @@ class FilterFunc implements Chainable
 
   public function __construct(
     string $func,
-    Chainable $chain = null,
+    ?Chainable $chain = null,
     array $args = []
   ) {
     $this->chain = $chain;