Add PHP 8.4 support

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     name: PHP ${{ matrix.php }} - Doctrine ${{ matrix.doctrine }}
     strategy:
       matrix:
-        php: ['8.0', '8.1', '8.2']
+        php: ['8.0', '8.1', '8.2', '8.3', '8.4']
         doctrine: ['2.11', '2.12', '2.13', '2.14']
     steps:
       - uses: actions/checkout@v3

src/Builders/AbstractBuilder.php

@@ -21,9 +21,9 @@ abstract class AbstractBuilder
 
     /**
      * @param ClassMetadataBuilder $builder
-     * @param NamingStrategy       $namingStrategy
+     * @param NamingStrategy|null  $namingStrategy
      */
-    public function __construct(ClassMetadataBuilder $builder, NamingStrategy $namingStrategy = null)
+    public function __construct(ClassMetadataBuilder $builder, ?NamingStrategy $namingStrategy = null)
     {
         $this->builder = $builder;
         $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy();

src/Builders/Builder.php

@@ -9,7 +9,7 @@
 use LogicException;
 
 /**
- * @method Field array($name, callable $callback = null)
+ * @method Field array($name, ?callable $callback = null)
  */
 class Builder extends AbstractBuilder implements Fluent
 {
@@ -26,7 +26,7 @@ class Builder extends AbstractBuilder implements Fluent
     /**
      * {@inheritdoc}
      */
-    public function table($name, callable $callback = null)
+    public function table($name, ?callable $callback = null)
     {
         $this->disallowInEmbeddedClasses();
 
@@ -40,7 +40,7 @@ public function table($name, callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function entity(callable $callback = null)
+    public function entity(?callable $callback = null)
     {
         $this->disallowInEmbeddedClasses();
 
@@ -54,7 +54,7 @@ public function entity(callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function inheritance($type, callable $callback = null)
+    public function inheritance($type, ?callable $callback = null)
     {
         $inheritance = Inheritance\InheritanceFactory::create($type, $this->builder);
 
@@ -66,23 +66,23 @@ public function inheritance($type, callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function singleTableInheritance(callable $callback = null)
+    public function singleTableInheritance(?callable $callback = null)
     {
         return $this->inheritance(Inheritance\Inheritance::SINGLE, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function joinedTableInheritance(callable $callback = null)
+    public function joinedTableInheritance(?callable $callback = null)
     {
         return $this->inheritance(Inheritance\Inheritance::JOINED, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function embed($embeddable, $field = null, callable $callback = null)
+    public function embed($embeddable, $field = null, ?callable $callback = null)
     {
         $embedded = new Embedded(
             $this->builder,
@@ -116,7 +116,7 @@ public function override($name, callable $callback)
     /**
      * {@inheritdoc}
      */
-    public function events(callable $callback = null)
+    public function events(?callable $callback = null)
     {
         $events = new LifecycleEvents($this->builder);
 
@@ -128,7 +128,7 @@ public function events(callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function listen(callable $callback = null)
+    public function listen(?callable $callback = null)
     {
         $events = new EntityListeners($this->builder);
 
@@ -151,7 +151,7 @@ public function isEmbeddedClass()
      *
      * @return Field
      */
-    protected function setArray($name, callable $callback = null)
+    protected function setArray($name, ?callable $callback = null)
     {
         return $this->field(Types::ARRAY, $name, $callback);
     }

src/Builders/Field.php

@@ -161,7 +161,7 @@ public function autoIncrement()
      *
      * @return Field
      */
-    public function generatedValue(callable $callback = null)
+    public function generatedValue(?callable $callback = null)
     {
         $generatedValue = new GeneratedValue($this->fieldBuilder, $this->classMetadata);
 

src/Builders/Traits/Aliases.php

@@ -7,7 +7,7 @@ trait Aliases
     /**
      * {@inheritdoc}
      */
-    public function increments($name, callable $callback = null)
+    public function increments($name, ?callable $callback = null)
     {
         $this->disallowInEmbeddedClasses();
 
@@ -17,7 +17,7 @@ public function increments($name, callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function smallIncrements($name, callable $callback = null)
+    public function smallIncrements($name, ?callable $callback = null)
     {
         $this->disallowInEmbeddedClasses();
 
@@ -27,7 +27,7 @@ public function smallIncrements($name, callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function bigIncrements($name, callable $callback = null)
+    public function bigIncrements($name, ?callable $callback = null)
     {
         $this->disallowInEmbeddedClasses();
 
@@ -37,31 +37,31 @@ public function bigIncrements($name, callable $callback = null)
     /**
      * {@inheritdoc}
      */
-    public function unsignedSmallInteger($name, callable $callback = null)
+    public function unsignedSmallInteger($name, ?callable $callback = null)
     {
         return $this->smallInteger($name, $callback)->unsigned();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function unsignedInteger($name, callable $callback = null)
+    public function unsignedInteger($name, ?callable $callback = null)
     {
         return $this->integer($name, $callback)->unsigned();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function unsignedBigInteger($name, callable $callback = null)
+    public function unsignedBigInteger($name, ?callable $callback = null)
     {
         return $this->bigInteger($name, $callback)->unsigned();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function rememberToken($name = 'rememberToken', callable $callback = null)
+    public function rememberToken($name = 'rememberToken', ?callable $callback = null)
     {
         return $this->string($name, $callback)->nullable()->length(100);
     }
@@ -79,29 +79,29 @@ abstract protected function disallowInEmbeddedClasses($message = '');
      *
      * @return \LaravelDoctrine\Fluent\Builders\Field
      */
-    abstract public function integer($name, callable $callback = null);
+    abstract public function integer($name, ?callable $callback = null);
 
     /**
      * @param string        $name
      * @param callable|null $callback
      *
      * @return \LaravelDoctrine\Fluent\Builders\Field
      */
-    abstract public function smallInteger($name, callable $callback = null);
+    abstract public function smallInteger($name, ?callable $callback = null);
 
     /**
      * @param string        $name
      * @param callable|null $callback
      *
      * @return \LaravelDoctrine\Fluent\Builders\Field
      */
-    abstract public function bigInteger($name, callable $callback = null);
+    abstract public function bigInteger($name, ?callable $callback = null);
 
     /**
      * @param string        $name
      * @param callable|null $callback
      *
      * @return \LaravelDoctrine\Fluent\Builders\Field
      */
-    abstract public function string($name, callable $callback = null);
+    abstract public function string($name, ?callable $callback = null);
 }

src/Builders/Traits/Dates.php

@@ -9,87 +9,87 @@ trait Dates
     /**
      * {@inheritdoc}
      */
-    public function date($name, callable $callback = null)
+    public function date($name, ?callable $callback = null)
     {
         return $this->field(Types::DATE_MUTABLE, $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function dateTime($name, callable $callback = null)
+    public function dateTime($name, ?callable $callback = null)
     {
         return $this->field(Types::DATETIME_MUTABLE, $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function dateTimeTz($name, callable $callback = null)
+    public function dateTimeTz($name, ?callable $callback = null)
     {
         return $this->field(Types::DATETIMETZ_MUTABLE, $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function time($name, callable $callback = null)
+    public function time($name, ?callable $callback = null)
     {
         return $this->field(Types::TIME_MUTABLE, $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function carbonDateTime($name, callable $callback = null)
+    public function carbonDateTime($name, ?callable $callback = null)
     {
         return $this->field('carbondatetime', $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function carbonDateTimeTz($name, callable $callback = null)
+    public function carbonDateTimeTz($name, ?callable $callback = null)
     {
         return $this->field('carbondatetimetz', $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function carbonDate($name, callable $callback = null)
+    public function carbonDate($name, ?callable $callback = null)
     {
         return $this->field('carbondate', $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function carbonTime($name, callable $callback = null)
+    public function carbonTime($name, ?callable $callback = null)
     {
         return $this->field('carbontime', $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function zendDate($name, callable $callback = null)
+    public function zendDate($name, ?callable $callback = null)
     {
         return $this->field('zenddate', $name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function timestamp($name, callable $callback = null)
+    public function timestamp($name, ?callable $callback = null)
     {
         return $this->carbonDateTime($name, $callback);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function timestampTz($name, callable $callback = null)
+    public function timestampTz($name, ?callable $callback = null)
     {
         return $this->carbonDateTimeTz($name, $callback);
     }
@@ -101,5 +101,5 @@ public function timestampTz($name, callable $callback = null)
      *
      * @return \LaravelDoctrine\Fluent\Builders\Field
      */
-    abstract public function field($type, $name, callable $callback = null);
+    abstract public function field($type, $name, ?callable $callback = null);
 }