[PHP 8.4] Fixes for implicit nullability deprecation

Fixes all issues that emit deprecation notices on PHP 8.4 for implicit nullable parameter type declarations. See: - [RFC](https://wiki.php.net/rfc/deprecate-implicitly-nullable-types) - [PHP 8.4: Implicitly nullable parameter declarations deprecated](https://php.watch/versions/8.4/implicitly-marking-parameter-type-nullable-deprecated)
yiisoft · Mar 16, 2024 · cbd41f0 · cbd41f0
1 parent 3587dfb
commit cbd41f0
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 26 deletions.
diff --git a/framework/base/Component.php b/framework/base/Component.php
@@ -604,7 +604,7 @@ public function off($name, $handler = null)
      * @param string $name the event name
      * @param Event|null $event the event instance. If not set, a default [[Event]] object will be created.
      */
-    public function trigger($name, Event $event = null)
+    public function trigger($name, ?Event $event = null)
     {
         $this->ensureBehaviors();
 

diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
@@ -784,7 +784,7 @@ public function orOnCondition($condition, $params = [])
      * @throws InvalidConfigException when query is not initialized properly
      * @see via()
      */
-    public function viaTable($tableName, $link, callable $callable = null)
+    public function viaTable($tableName, $link, ?callable $callable = null)
     {
         $modelClass = $this->primaryModel ? get_class($this->primaryModel) : $this->modelClass;
         $relation = new self($modelClass, [

diff --git a/framework/db/ActiveQueryInterface.php b/framework/db/ActiveQueryInterface.php
@@ -96,7 +96,7 @@ public function with();
      * Its signature should be `function($query)`, where `$query` is the query to be customized.
      * @return $this the relation object itself.
      */
-    public function via($relationName, callable $callable = null);
+    public function via($relationName, ?callable $callable = null);
 
     /**
      * Finds the related records for the specified primary record.

diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php
@@ -102,7 +102,7 @@ public function __clone()
      * Its signature should be `function($query)`, where `$query` is the query to be customized.
      * @return $this the relation object itself.
      */
-    public function via($relationName, callable $callable = null)
+    public function via($relationName, ?callable $callable = null)
     {
         $relation = $this->primaryModel->getRelation($relationName);
         $callableUsed = $callable !== null;

diff --git a/framework/mail/BaseMessage.php b/framework/mail/BaseMessage.php
@@ -38,7 +38,7 @@ abstract class BaseMessage extends BaseObject implements MessageInterface
      * the "mailer" application component will be used instead.
      * @return bool whether this message is sent successfully.
      */
-    public function send(MailerInterface $mailer = null)
+    public function send(?MailerInterface $mailer = null)
     {
         if ($mailer === null && $this->mailer === null) {
             $mailer = Yii::$app->getMailer();

diff --git a/framework/mail/MessageInterface.php b/framework/mail/MessageInterface.php
@@ -208,7 +208,7 @@ public function embedContent($content, array $options = []);
      * If null, the "mailer" application component will be used instead.
      * @return bool whether this message is sent successfully.
      */
-    public function send(MailerInterface $mailer = null);
+    public function send(?MailerInterface $mailer = null);
 
     /**
      * Returns string representation of this message.

diff --git a/tests/framework/base/ControllerTest.php b/tests/framework/base/ControllerTest.php
@@ -56,7 +56,7 @@ public function testRunAction(): void
     public function testCreateInlineAction(
         string $controllerClass,
         string $actionId,
-        string $expectedActionMethod = null
+        ?string $expectedActionMethod = null
     ): void {
         $this->mockApplication();
         /** @var Controller $controller */

diff --git a/tests/framework/behaviors/AttributeBehaviorTest.php b/tests/framework/behaviors/AttributeBehaviorTest.php
@@ -105,7 +105,7 @@ public function testPreserveNonEmptyValues(
         string $aliasExpected,
         bool $preserveNonEmptyValues,
         string $name,
-        string $alias = null
+        ?string $alias = null
     ): void {
         $model = new ActiveRecordWithAttributeBehavior();
         $model->attributeBehavior->preserveNonEmptyValues = $preserveNonEmptyValues;

diff --git a/tests/framework/behaviors/AttributesBehaviorTest.php b/tests/framework/behaviors/AttributesBehaviorTest.php
@@ -105,7 +105,7 @@ public function testPreserveNonEmptyValues(
         string $aliasExpected,
         bool $preserveNonEmptyValues,
         string $name,
-        string $alias = null
+        ?string $alias = null
     ): void {
         $model = new ActiveRecordWithAttributesBehavior();
         $model->attributesBehavior->preserveNonEmptyValues = $preserveNonEmptyValues;

diff --git a/tests/framework/console/FakePhp71Controller.php b/tests/framework/console/FakePhp71Controller.php
@@ -19,7 +19,7 @@ public function actionInjection(
         Request $request,
         $between,
         DummyService $dummyService,
-        Post $post = null,
+        ?Post $post = null,
         $after
     ): void {
     }

diff --git a/tests/framework/console/RequestTest.php b/tests/framework/console/RequestTest.php
@@ -185,7 +185,7 @@ public static function provider(): array
      * @param array $expected The expected result.
      * @param array|null $expectedException The expected exception.
      */
-    public function testResolve(array $params, array $expected, array $expectedException = null): void
+    public function testResolve(array $params, array $expected, ?array $expectedException = null): void
     {
         if (isset($expectedException)) {
             $this->expectException($expectedException[0]);

diff --git a/tests/framework/di/ContainerTest.php b/tests/framework/di/ContainerTest.php
@@ -236,7 +236,7 @@ public function testOptionalDependencies(): void
     {
         $container = new Container();
         // Test optional unresolvable dependency.
-        $closure = fn(QuxInterface $test = null) => $test;
+        $closure = fn(?QuxInterface $test = null) => $test;
         $this->assertNull($container->invoke($closure));
     }
 

diff --git a/tests/framework/di/stubs/Alpha.php b/tests/framework/di/stubs/Alpha.php
@@ -12,10 +12,10 @@ class Alpha extends BaseObject
     public $color = true;
 
     public function __construct(
-        Beta $beta = null,
-        QuxInterface $omega = null,
-        Unknown $unknown = null,
-        AbstractColor $color = null
+        ?Beta $beta = null,
+        ?QuxInterface $omega = null,
+        ?Unknown $unknown = null,
+        ?AbstractColor $color = null
     ) {
         $this->beta = $beta;
         $this->omega = $omega;

diff --git a/tests/framework/filters/AccessRuleTest.php b/tests/framework/filters/AccessRuleTest.php
@@ -44,7 +44,7 @@ protected function mockRequest(string $method = 'GET'): Request
         return $request;
     }
 
-    protected function mockUser(string $userid = null): User
+    protected function mockUser(?string $userid = null): User
     {
         $user = new User([
             'identityClass' => UserIdentity::class,

diff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php
@@ -1636,7 +1636,7 @@ function ($model): void {
     /**
      * @dataProvider errorSummaryDataProvider
      */
-    public function testErrorSummary(string $value, array $options, string $expectedHtml, \Closure $beforeValidate = null): void
+    public function testErrorSummary(string $value, array $options, string $expectedHtml, ?\Closure $beforeValidate = null): void
     {
         $model = new HtmlTestModel();
         $model->name = $value;

diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php
@@ -553,7 +553,7 @@ public static function dateInputs()
      * @param mixed $value
      * @param mixed|null $expectedException
      */
-    public function testIntlDateInput(string|bool $expected, string $value, string $expectedException = null): void
+    public function testIntlDateInput(string|bool $expected, string $value, ?string $expectedException = null): void
     {
         $this->testDateInput($expected, $value, $expectedException);
     }
@@ -564,7 +564,7 @@ public function testIntlDateInput(string|bool $expected, string $value, string $
      * @param mixed $value
      * @param mixed|null $expectedException
      */
-    public function testDateInput(string|bool $expected, string $value, string $expectedException = null): void
+    public function testDateInput(string|bool $expected, string $value, ?string $expectedException = null): void
     {
         if ($expectedException !== null) {
             $this->expectException($expectedException);

diff --git a/tests/framework/rest/IndexActionTest.php b/tests/framework/rest/IndexActionTest.php
@@ -77,8 +77,8 @@ public function testPrepareSearchQueryAttribute(): void
     public function testPrepareDataProviderWithPaginationAndSorting(
         \yii\data\Pagination|bool|array $pagination,
         \yii\data\Sort|bool|array $sort,
-        int $expectedPaginationPageSize = null,
-        int $expectedPaginationDefaultPageSize = null,
+        ?int $expectedPaginationPageSize = null,
+        ?int $expectedPaginationDefaultPageSize = null,
         array $expectedSortOrders = [],
         ?array $expectedSortDefaultOrder = null
     ): void {

diff --git a/tests/framework/web/AssetBundleTest.php b/tests/framework/web/AssetBundleTest.php
@@ -509,7 +509,7 @@ public static function registerFileDataProvider()
      * @param string|bool $appendTimestamp
      * @param string|null $webAlias
      */
-    public function testRegisterFileAppendTimestamp(string $type, string $path, bool $appendTimestamp, string $expected, string $webAlias = null): void
+    public function testRegisterFileAppendTimestamp(string $type, string $path, bool $appendTimestamp, string $expected, ?string $webAlias = null): void
     {
         $originalAlias = Yii::getAlias('@web');
         if ($webAlias === null) {

diff --git a/tests/framework/web/FakePhp71Controller.php b/tests/framework/web/FakePhp71Controller.php
@@ -26,7 +26,7 @@ public function actionInjection(
         Request $request,
         $between,
         VendorImage $vendorImage,
-        Post $post = null,
+        ?Post $post = null,
         $after
     ): void {
     }

diff --git a/tests/framework/web/FakePhp7Controller.php b/tests/framework/web/FakePhp7Controller.php
@@ -17,11 +17,11 @@ class FakePhp7Controller extends Controller
 {
     public $enableCsrfValidation = false;
 
-    public function actionAksi1(int $foo, float $bar = null, bool $true, bool $false): void
+    public function actionAksi1(int $foo, ?float $bar = null, bool $true, bool $false): void
     {
     }
 
-    public function actionStringy(string $foo = null): void
+    public function actionStringy(?string $foo = null): void
     {
     }
 }