Merge pull request #20031 from terabytesoftw/rector-fixeds

Apply rector fixeds in directory tests.

Author: bizley

tests/TestCase.php

@@ -33,13 +33,13 @@ public static function tearDownAfterClass(): void
      * @param mixed $default default value to use when param is not set.
      * @return mixed  the value of the configuration param
      */
-    public static function getParam($name, $default = null)
+    public static function getParam($name, mixed $default = null)
     {
         if (static::$params === null) {
             static::$params = require __DIR__ . '/data/config.php';
         }
 
-        return isset(static::$params[$name]) ? static::$params[$name] : $default;
+        return static::$params[$name] ?? $default;
     }
 
     /**
@@ -90,9 +90,9 @@ protected function mockWebApplication($config = [], $appClass = '\yii\web\Applic
 
     protected function getVendorPath()
     {
-        $vendor = dirname(dirname(__DIR__)) . '/vendor';
+        $vendor = dirname(__DIR__, 2) . '/vendor';
         if (!is_dir($vendor)) {
-            $vendor = dirname(dirname(dirname(dirname(__DIR__))));
+            $vendor = dirname(__DIR__, 4);
         }
 
         return $vendor;
@@ -141,11 +141,9 @@ protected function assertEqualsAnyWhitespace($expected, $actual, $message = ''){
      * Used on objects, it asserts that two variables reference
      * the same object.
      *
-     * @param mixed  $expected
-     * @param mixed  $actual
      * @param string $message
      */
-    protected function assertSameAnyWhitespace($expected, $actual, $message = ''){
+    protected function assertSameAnyWhitespace(mixed $expected, mixed $actual, $message = ''){
         if (is_string($expected)) {
             $expected = $this->sanitizeWhitespaces($expected);
         }
@@ -159,14 +157,12 @@ protected function assertSameAnyWhitespace($expected, $actual, $message = ''){
     /**
      * Asserts that a haystack contains a needle ignoring line endings.
      *
-     * @param mixed $needle
-     * @param mixed $haystack
      * @param string $message
      */
-    protected function assertContainsWithoutLE($needle, $haystack, $message = '')
+    protected function assertContainsWithoutLE(mixed $needle, mixed $haystack, $message = '')
     {
-        $needle = str_replace("\r\n", "\n", $needle);
-        $haystack = str_replace("\r\n", "\n", $haystack);
+        $needle = str_replace("\r\n", "\n", (string) $needle);
+        $haystack = str_replace("\r\n", "\n", (string) $haystack);
 
         $this->assertStringContainsString($needle, $haystack, $message);
     }
@@ -179,7 +175,7 @@ protected function assertContainsWithoutLE($needle, $haystack, $message = '')
      * @return string
      */
     protected function sanitizeWhitespaces($string){
-        return preg_replace("/[\pZ\pC]/u", " ", $string);
+        return preg_replace("/[\pZ\pC]/u", " ", (string) $string);
     }
 
     /**
@@ -253,11 +249,9 @@ protected function getInaccessibleProperty($object, $propertyName, $revoke = tru
     /**
      * Asserts that value is one of expected values.
      *
-     * @param mixed $actual
-     * @param array $expected
      * @param string $message
      */
-    public function assertIsOneOf($actual, array $expected, $message = '')
+    public function assertIsOneOf(mixed $actual, array $expected, $message = ''): void
     {
         self::assertThat($actual, new IsOneOfAssert($expected), $message);
     }
@@ -272,9 +266,9 @@ protected function switchDbConnection($db)
         if (isset($databases[$db])) {
             $database = $databases[$db];
             Yii::$app->db->close();
-            Yii::$app->db->dsn = isset($database['dsn']) ? $database['dsn'] : null;
-            Yii::$app->db->username = isset($database['username']) ? $database['username'] : null;
-            Yii::$app->db->password = isset($database['password']) ? $database['password'] : null;
+            Yii::$app->db->dsn = $database['dsn'] ?? null;
+            Yii::$app->db->username = $database['username'] ?? null;
+            Yii::$app->db->password = $database['password'] ?? null;
         }
     }
 }

tests/data/ar/Animal.php

@@ -23,10 +23,10 @@ public static function tableName()
         return 'animal';
     }
 
-    public function init()
+    public function init(): void
     {
         parent::init();
-        $this->type = \get_called_class();
+        $this->type = static::class;
     }
 
     public function getDoes()

tests/data/ar/Cat.php

@@ -19,7 +19,7 @@ class Cat extends Animal
      * @param self $record
      * @param array $row
      */
-    public static function populateRecord($record, $row)
+    public static function populateRecord($record, $row): void
     {
         parent::populateRecord($record, $row);
 
@@ -31,7 +31,7 @@ public static function populateRecord($record, $row)
      * @throw DivisionByZeroError
      * @return float|int
      */
-    public function getException()
+    public function getException(): never
     {
         throw new \Exception('no');
     }

tests/data/ar/Customer.php

@@ -23,8 +23,8 @@
  */
 class Customer extends ActiveRecord
 {
-    const STATUS_ACTIVE = 1;
-    const STATUS_INACTIVE = 2;
+    final public const STATUS_ACTIVE = 1;
+    final public const STATUS_INACTIVE = 2;
 
     public $status2;
 
@@ -81,7 +81,7 @@ public function getOrderItems()
         /* @var $rel ActiveQuery */
         $rel = $this->hasMany(Item::class, ['id' => 'item_id']);
 
-        return $rel->viaTable('order_item', ['order_id' => 'id'], function ($q) {
+        return $rel->viaTable('order_item', ['order_id' => 'id'], function ($q): void {
             /* @var $q ActiveQuery */
             $q->viaTable('order', ['customer_id' => 'id']);
         })->orderBy('id');
@@ -99,7 +99,7 @@ public function getItems()
             ->via('orderItems2');
     }
 
-    public function afterSave($insert, $changedAttributes)
+    public function afterSave($insert, $changedAttributes): void
     {
         ActiveRecordTest::$afterSaveInsert = $insert;
         ActiveRecordTest::$afterSaveNewRecord = $this->isNewRecord;
@@ -112,6 +112,6 @@ public function afterSave($insert, $changedAttributes)
      */
     public static function find()
     {
-        return new CustomerQuery(\get_called_class());
+        return new CustomerQuery(static::class);
     }
 }

tests/data/ar/CustomerQuery.php

@@ -16,7 +16,7 @@ class CustomerQuery extends ActiveQuery
 {
     public static $joinWithProfile = false;
 
-    public function init()
+    public function init(): void
     {
         if (static::$joinWithProfile) {
             $this->innerJoinWith('profile');

tests/data/ar/CustomerWithAlias.php

@@ -15,8 +15,8 @@
  */
 class CustomerWithAlias extends ActiveRecord
 {
-    const STATUS_ACTIVE = 1;
-    const STATUS_INACTIVE = 2;
+    final public const STATUS_ACTIVE = 1;
+    final public const STATUS_INACTIVE = 2;
 
     public $status2;
 
@@ -33,7 +33,7 @@ public static function tableName()
      */
     public static function find()
     {
-        $activeQuery = new CustomerQuery(get_called_class());
+        $activeQuery = new CustomerQuery(static::class);
         $activeQuery->alias('csr');
         return $activeQuery;
     }

tests/data/ar/Dog.php

@@ -19,7 +19,7 @@ class Dog extends Animal
      * @param self $record
      * @param array $row
      */
-    public static function populateRecord($record, $row)
+    public static function populateRecord($record, $row): void
     {
         parent::populateRecord($record, $row);
 

tests/data/ar/NoAutoLabels.php

@@ -20,7 +20,7 @@ public function attributeLabels()
         ];
     }
 
-    public function generateAttributeLabel($name)
+    public function generateAttributeLabel($name): never
     {
         throw new \yii\base\InvalidArgumentException('Label not defined!');
     }

tests/data/ar/Order.php

@@ -68,9 +68,7 @@ public function getOrderItems2()
     public function getOrderItems3()
     {
         return $this->hasMany(OrderItem::class, ['order_id' => 'id'])
-            ->indexBy(function ($row) {
-                return $row['order_id'] . '_' . $row['item_id'];
-            });
+            ->indexBy(fn($row) => $row['order_id'] . '_' . $row['item_id']);
     }
 
     public function getOrderItemsWithNullFK()
@@ -81,23 +79,23 @@ public function getOrderItemsWithNullFK()
     public function getItems()
     {
         return $this->hasMany(Item::class, ['id' => 'item_id'])
-            ->via('orderItems', function ($q) {
+            ->via('orderItems', function ($q): void {
                 // additional query configuration
             })->orderBy('item.id');
     }
 
     public function getExpensiveItemsUsingViaWithCallable()
     {
         return $this->hasMany(Item::class, ['id' => 'item_id'])
-            ->via('orderItems', function (ActiveQuery $q) {
+            ->via('orderItems', function (ActiveQuery $q): void {
                 $q->where(['>=', 'subtotal', 10]);
             });
     }
 
     public function getCheapItemsUsingViaWithCallable()
     {
         return $this->hasMany(Item::class, ['id' => 'item_id'])
-            ->via('orderItems', function (ActiveQuery $q) {
+            ->via('orderItems', function (ActiveQuery $q): void {
                 $q->where(['<', 'subtotal', 10]);
             });
     }
@@ -117,15 +115,15 @@ public function getItemsWithNullFK()
     public function getItemsInOrder1()
     {
         return $this->hasMany(Item::class, ['id' => 'item_id'])
-            ->via('orderItems', function ($q) {
+            ->via('orderItems', function ($q): void {
                 $q->orderBy(['subtotal' => SORT_ASC]);
             })->orderBy('name');
     }
 
     public function getItemsInOrder2()
     {
         return $this->hasMany(Item::class, ['id' => 'item_id'])
-            ->via('orderItems', function ($q) {
+            ->via('orderItems', function ($q): void {
                 $q->orderBy(['subtotal' => SORT_DESC]);
             })->orderBy('name');
     }

tests/data/base/ArrayAccessObject.php

@@ -30,7 +30,7 @@ class ArrayAccessObject extends TraversableObject implements \ArrayAccess
      * @since 2.0.14.1
      */
     #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset)
     {
         return isset($this->data[$offset]);
     }
@@ -46,7 +46,7 @@ public function offsetExists($offset)
      * @since 2.0.14.1
      */
     #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset)
     {
         return $this->data[$offset];
     }
@@ -65,7 +65,7 @@ public function offsetGet($offset)
      * @since 2.0.14.1
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         $this->data[$offset] = $value;
     }
@@ -81,7 +81,7 @@ public function offsetSet($offset, $value)
      * @since 2.0.14.1
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->data[$offset]);
     }