Make test data providers static and declare array return types in db tests.

tests/framework/db/ActiveRecordTest.php

@@ -813,12 +813,12 @@ public function testJoinWithEager(): void
         $this->assertEquals($eagerItemsCount, $lazyItemsCount);
     }
 
-    public function aliasMethodProvider()
+    public static function aliasMethodProvider(): array
     {
         return [
             ['explicit'], // c
-//            ['querysyntax'], // {{@customer}}
-//            ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated
+            // ['querysyntax'], // {{@customer}}
+            // ['applyAlias'], // $query->applyAlias('customer', 'id') // _aliases are currently not being populated
             // later getRelationAlias() could be added
         ];
     }
@@ -1129,7 +1129,7 @@ public function testFindSimpleRelationWithJoin(): void
         $this->assertInstanceOf('yiiunit\data\ar\Customer', $customerWithJoinIndexOrdered['user1']);
     }
 
-    public function tableNameProvider()
+    public static function tableNameProvider(): array
     {
         return [
             ['order', 'order_item'],
@@ -1895,7 +1895,7 @@ public function testFilterTableNamesFromAliases($fromParams, $expectedAliases):
         $this->assertEquals($expectedAliases, $aliases);
     }
 
-    public function filterTableNamesFromAliasesProvider()
+    public static function filterTableNamesFromAliasesProvider(): array
     {
         return [
             'table name as string'         => ['customer', []],
@@ -1907,7 +1907,7 @@ public function filterTableNamesFromAliasesProvider()
         ];
     }
 
-    public function legalValuesForFindByCondition()
+    public static function legalValuesForFindByCondition(): array
     {
         return [
             [Customer::class, ['id' => 1]],
@@ -1938,7 +1938,7 @@ public function testLegalValuesForFindByCondition($modelClassName, $validFilter)
         $this->assertTrue(true);
     }
 
-    public function illegalValuesForFindByCondition()
+    public static function illegalValuesForFindByCondition(): array
     {
         return [
             [Customer::class, [['`id`=`id` and 1' => 1]]],
@@ -2133,7 +2133,7 @@ public function testEagerLoadingWithTypeCastedCompositeIdentifier(): void
         }
     }
 
-    public function providerForUnlinkDelete()
+    public static function providerForUnlinkDelete(): array
     {
         return [
             'with delete' => [true, 0],
@@ -2180,7 +2180,7 @@ public function testVirtualRelation(): void
         $this->assertNotNull($order->virtualCustomer);
     }
 
-    public function labelTestModelProvider()
+    public static function labelTestModelProvider(): array
     {
         $data = [];
 

tests/framework/db/ColumnSchemaBuilderTest.php

@@ -27,7 +27,7 @@ public function getColumnSchemaBuilder($type, $length = null)
     /**
      * @return array
      */
-    public function typesProvider()
+    public static function typesProvider(): array
     {
         return [
             ['integer NULL DEFAULT NULL', Schema::TYPE_INTEGER, null, [

tests/framework/db/CommandTest.php

@@ -245,7 +245,7 @@ public function testBindParamValue(): void
         $this->assertEquals('[email protected]', $command->queryScalar());
     }
 
-    public function paramsNonWhereProvider()
+    public static function paramsNonWhereProvider(): array
     {
         return [
             ['SELECT SUBSTR(name, :len) FROM {{customer}} WHERE [[email]] = :email GROUP BY SUBSTR(name, :len)'],
@@ -380,7 +380,7 @@ public function testBatchInsertDataTypesLocale(): void
         setlocale(LC_NUMERIC, $locale);
     }
 
-    public function batchInsertSqlProvider()
+    public static function batchInsertSqlProvider(): array
     {
         return [
             'issue11242' => [
@@ -615,7 +615,7 @@ public function testInsertSelectAlias(): void
      * Data provider for testInsertSelectFailed.
      * @return array
      */
-    public function invalidSelectColumns()
+    public static function invalidSelectColumns(): array
     {
         return [
             [[]],
@@ -805,7 +805,7 @@ public function testRenameTable(): void
         $this->assertNotNull($db->getSchema()->getTableSchema($toTableName, true));
     }
 
-    public function upsertProvider()
+    public static function upsertProvider(): array
     {
         return [
             'regular values' => [
@@ -1343,7 +1343,7 @@ public function testColumnCase(): void
      * Data provider for [[testGetRawSql()]].
      * @return array test data
      */
-    public function dataProviderGetRawSql()
+    public static function dataProviderGetRawSql(): array
     {
         return [
             [

tests/framework/db/SchemaTest.php

@@ -28,7 +28,7 @@ abstract class SchemaTest extends DatabaseTestCase
      */
     protected $expectedSchemas;
 
-    public function pdoAttributesProvider()
+    public static function pdoAttributesProvider(): array
     {
         return [
             [[PDO::ATTR_EMULATE_PREPARES => true]],
@@ -157,7 +157,7 @@ public function testRefreshTableSchema(): void
         $this->assertNotSame($noCacheTable, $refreshedTable);
     }
 
-    public function tableSchemaCachePrefixesProvider()
+    public static function tableSchemaCachePrefixesProvider(): array
     {
         $configs = [
             [
@@ -558,7 +558,7 @@ public function testColumnSchemaDbTypecastBooleanPhpType($value, $expected): voi
         $this->assertSame($expected, $columnSchema->dbTypecast($value));
     }
 
-    public function columnSchemaDbTypecastBooleanPhpTypeProvider()
+    public static function columnSchemaDbTypecastBooleanPhpTypeProvider(): array
     {
         return [
             [1, true],
@@ -646,7 +646,7 @@ public function testContraintTablesExistance(): void
         }
     }
 
-    public function constraintsProvider()
+    public static function constraintsProvider(): array
     {
         return [
             '1: primary key' => ['T_constraints_1', 'primaryKey', new Constraint([
@@ -753,14 +753,14 @@ public function constraintsProvider()
         ];
     }
 
-    public function lowercaseConstraintsProvider()
+    public static function lowercaseConstraintsProvider(): array
     {
-        return $this->constraintsProvider();
+        return static::constraintsProvider();
     }
 
-    public function uppercaseConstraintsProvider()
+    public static function uppercaseConstraintsProvider(): array
     {
-        return $this->constraintsProvider();
+        return static::constraintsProvider();
     }
 
     /**

tests/framework/db/cubrid/ColumnSchemaBuilderTest.php

@@ -33,7 +33,7 @@ public function getColumnSchemaBuilder($type, $length = null)
     /**
      * @return array
      */
-    public function typesProvider()
+    public static function typesProvider(): array
     {
         return [
             ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [

tests/framework/db/cubrid/CommandTest.php

@@ -85,7 +85,7 @@ public function testAutoQuoting(): void
         $this->assertEquals('SELECT "id", "t"."name" FROM "customer" t', $command->sql);
     }
 
-    public function batchInsertSqlProvider()
+    public static function batchInsertSqlProvider(): array
     {
         $data = parent::batchInsertSqlProvider();
         $data['issue11242']['expected'] = 'INSERT INTO "type" ("int_col", "float_col", "char_col") VALUES (NULL, NULL, \'Kyiv {{city}}, Ukraine\')';

tests/framework/db/cubrid/SchemaTest.php

@@ -87,11 +87,11 @@ public function getExpectedColumns()
         return $columns;
     }
 
-    public function constraintsProvider()
+    public static function constraintsProvider(): array
     {
         $result = parent::constraintsProvider();
         foreach ($result as $name => $constraints) {
-            $result[$name][2] = $this->convertPropertiesToAnycase($constraints[2]);
+            $result[$name][2] = self::convertPropertiesToAnycase($constraints[2]);
         }
         $result['1: check'][2] = false;
         unset($result['1: index'][2][0]);
@@ -108,35 +108,25 @@ public function constraintsProvider()
         return $result;
     }
 
-    public function lowercaseConstraintsProvider(): void
-    {
-        $this->markTestSkipped('This test hangs on CUBRID.');
-    }
-
-    public function uppercaseConstraintsProvider(): void
-    {
-        $this->markTestSkipped('This test hangs on CUBRID.');
-    }
-
     /**
      * @param array|object|string $object
      * @param bool $isProperty
      * @return array|object|string
      */
-    private function convertPropertiesToAnycase($object, $isProperty = false)
+    private static function convertPropertiesToAnycase($object, $isProperty = false)
     {
         if (!$isProperty && \is_array($object)) {
             $result = [];
             foreach ($object as $name => $value) {
-                $result[] = $this->convertPropertiesToAnycase($value);
+                $result[] = self::convertPropertiesToAnycase($value);
             }
 
             return $result;
         }
 
         if (\is_object($object)) {
             foreach (array_keys((array) $object) as $name) {
-                $object->$name = $this->convertPropertiesToAnycase($object->$name, true);
+                $object->$name = self::convertPropertiesToAnycase($object->$name, true);
             }
         } elseif (\is_array($object) || \is_string($object)) {
             $object = new AnyCaseValue($object);

tests/framework/db/mssql/CommandTest.php

@@ -90,7 +90,7 @@ public function testBindParamValue(): void
         $this->assertEquals('[email protected]', $command->queryScalar());
     }
 
-    public function paramsNonWhereProvider()
+    public static function paramsNonWhereProvider(): array
     {
         return[
             ['SELECT SUBSTRING(name, :len, 6) AS name FROM {{customer}} WHERE [[email]] = :email GROUP BY name'],
@@ -122,7 +122,7 @@ public function testAddDropDefaultValue(): void
         $this->assertEmpty($schema->getTableDefaultValues($tableName, true));
     }
 
-    public function batchInsertSqlProvider()
+    public static function batchInsertSqlProvider(): array
     {
         $data = parent::batchInsertSqlProvider();
         $data['issue11242']['expected'] = 'INSERT INTO [type] ([int_col], [float_col], [char_col]) VALUES (NULL, NULL, \'Kyiv {{city}}, Ukraine\')';

tests/framework/db/mssql/SchemaTest.php

@@ -25,7 +25,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
         'dbo',
     ];
 
-    public function constraintsProvider()
+    public static function constraintsProvider(): array
     {
         $result = parent::constraintsProvider();
         $result['1: check'][2][0]->expression = '([C_check]<>\'\')';
@@ -100,7 +100,7 @@ public function testQuoteTableName($name, $expectedName): void
         $this->assertEquals($expectedName, $quotedName);
     }
 
-    public function quoteTableNameDataProvider()
+    public static function quoteTableNameDataProvider(): array
     {
         return [
             ['test', '[test]'],
@@ -127,7 +127,7 @@ public function testGetTableSchema($name, $expectedName): void
         $this->assertEquals($expectedName, $tableSchema->name);
     }
 
-    public function getTableSchemaDataProvider()
+    public static function getTableSchemaDataProvider(): array
     {
         return [
             ['[dbo].[profile]', 'profile'],

tests/framework/db/mysql/ColumnSchemaBuilderTest.php

@@ -33,7 +33,7 @@ public function getColumnSchemaBuilder($type, $length = null)
     /**
      * @return array
      */
-    public function typesProvider()
+    public static function typesProvider(): array
     {
         return [
             ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [

tests/framework/db/mysql/SchemaTest.php

@@ -76,7 +76,7 @@ public function testGetSchemaNames(): void
         $this->markTestSkipped('Schemas are not supported in MySQL.');
     }
 
-    public function constraintsProvider()
+    public static function constraintsProvider(): array
     {
         $result = parent::constraintsProvider();
 

tests/framework/db/oci/ColumnSchemaBuilderTest.php

@@ -33,7 +33,7 @@ public function getColumnSchemaBuilder($type, $length = null)
     /**
      * @return array
      */
-    public function typesProvider()
+    public static function typesProvider(): array
     {
         return [
             ['integer UNSIGNED', Schema::TYPE_INTEGER, null, [

tests/framework/db/oci/CommandTest.php

@@ -42,7 +42,7 @@ public function testLastInsertId(): void
         $this->assertSame('3', $db->getSchema()->getLastInsertID('profile_SEQ'));
     }
 
-    public function batchInsertSqlProvider()
+    public static function batchInsertSqlProvider(): array
     {
         $data = parent::batchInsertSqlProvider();
         $data['issue11242']['expected'] = 'INSERT ALL  INTO "type" ("int_col", "float_col", "char_col") ' .
@@ -161,7 +161,7 @@ public function testQueryCache(): void
         }, 10);
     }
 
-    public function paramsNonWhereProvider()
+    public static function paramsNonWhereProvider(): array
     {
         return [
             ['SELECT SUBSTR([[name]], :len) FROM {{customer}} WHERE [[email]] = :email GROUP BY SUBSTR([[name]], :len)'],

tests/framework/db/oci/SchemaTest.php

@@ -110,7 +110,7 @@ public function testAutoincrementDisabled(): void
         $this->assertFalse($table->columns['id']->autoIncrement);
     }
 
-    public function constraintsProvider()
+    public static function constraintsProvider(): array
     {
         $result = parent::constraintsProvider();
         $result['1: check'][2][0]->expression = '"C_check" <> \'\'';

tests/framework/db/pgsql/ActiveRecordTest.php

@@ -215,7 +215,7 @@ public function testArrayValues($attributes): void
         $this->assertSame(1, $type->update(), 'The record got updated');
     }
 
-    public function arrayValuesProvider()
+    public static function arrayValuesProvider(): array
     {
         return [
             'simple arrays values' => [[

tests/framework/db/pgsql/ArrayParserTest.php

@@ -19,7 +19,7 @@ protected function setUp(): void
         $this->arrayParser = new ArrayParser();
     }
 
-    public function convertProvider()
+    public static function convertProvider(): array
     {
         return [
             ['{}', []],

tests/framework/db/pgsql/CommandTest.php

@@ -80,7 +80,7 @@ public function testLastInsertId(): void
         $this->assertSame('3', $db->getSchema()->getLastInsertID('schema1.profile_id_seq'));
     }
 
-    public function dataProviderGetRawSql()
+    public static function dataProviderGetRawSql(): array
     {
         return array_merge(parent::dataProviderGetRawSql(), [
             [
@@ -117,7 +117,7 @@ public function testSaveSerializedObject(): void
         $this->assertEquals(1, $command->execute());
     }
 
-    public function batchInsertSqlProvider()
+    public static function batchInsertSqlProvider(): array
     {
         $data = parent::batchInsertSqlProvider();
         $data['issue11242']['expected'] = 'INSERT INTO "type" ("int_col", "float_col", "char_col") VALUES (NULL, NULL, \'Kyiv {{city}}, Ukraine\')';