diff --git a/.gitignore b/.gitignore index aa8f2978..5f934624 100644 --- a/.gitignore +++ b/.gitignore @@ -26,13 +26,9 @@ composer.phar phpunit.phar # local phpunit config /phpunit.xml -# phpunit cache -.phpunit.result.cache -.phpunit.cache # Phan analysis.txt # PHP CS Fixer -/.php-cs-fixer.cache /.php-cs-fixer.php diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 362e2cf1..7742c26b 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -14,6 +14,7 @@ ]); return (new Config()) + ->setCacheFile(__DIR__ . '/runtime/.php-cs-fixer.cache') ->setRiskyAllowed(true) ->setParallelConfig(ParallelConfigFactory::detect()) ->setRules([ diff --git a/composer.json b/composer.json index a3adff51..5a551b96 100644 --- a/composer.json +++ b/composer.json @@ -61,6 +61,7 @@ "psr-4": { "Yiisoft\\Db\\Migration\\Tests\\": "tests", "Yiisoft\\Db\\Migration\\Tests\\NonExistsDirectory\\": "tests/non-exists-directory", + "Yiisoft\\Db\\Migration\\Tests\\Runtime\\": "runtime/tests", "Yiisoft\\Db\\Migration\\Tests\\ForTest\\": "tests/Support", "Yiisoft\\Db\\Migration\\Tests\\Support\\": "tests/Support", "Yiisoft\\Db\\Migration\\Tests\\Support\\MigrationsExtra\\": [ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index ea007a28..16def497 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,7 @@ runYiiDbMigration(); $this->assertSame(1, $exitCode); $this->assertStringContainsString('not found', $output); $this->assertStringContainsString( - 'cp "' . dirname(__DIR__) . '/runtime/bin/vendor/yiisoft/db-migration/bin/yii-db-migration.php" "' - . dirname(__DIR__) . '/runtime/bin/yii-db-migration.php"', + 'cp "' . dirname(__DIR__, 2) . '/runtime/tests/bin/vendor/yiisoft/db-migration/bin/yii-db-migration.php" "' + . dirname(__DIR__, 2) . '/runtime/tests/bin/yii-db-migration.php"', $output, ); } @@ -95,7 +95,7 @@ public function testNamedDatabase(): void ), ], PHP); - $directory = dirname(__DIR__) . '/runtime/bin'; + $directory = dirname(__DIR__, 2) . '/runtime/tests/bin'; FileHelper::ensureDirectory($directory . '/maps'); file_put_contents($directory . '/maps/M260930000000Maps.php', <<<'PHP' namedDefaultConfig()); [$output, $exitCode] = $this->runYiiDbMigration(['migrate:create', 'Example']); @@ -144,7 +144,7 @@ public static function legacyOptions(): array #[DataProvider('legacyOptions')] public function testRejectsDuplicateDefaultConfiguration(string $option): void { - $directory = dirname(__DIR__) . '/runtime/bin'; + $directory = dirname(__DIR__, 2) . '/runtime/tests/bin'; file_put_contents($directory . '/yii-db-migration.php', str_replace( 'return [', "return ['$option' => null,", @@ -177,7 +177,7 @@ private function namedDefaultConfig(): string private function replaceParams($search, $replace): void { - $file = dirname(__DIR__) . '/runtime/bin/yii-db-migration.php'; + $file = dirname(__DIR__, 2) . '/runtime/tests/bin/yii-db-migration.php'; file_put_contents( $file, str_replace($search, $replace, file_get_contents($file)), diff --git a/tests/Migration/ConfigTest.php b/tests/Migration/ConfigTest.php index 3ba9e329..c0498c04 100644 --- a/tests/Migration/ConfigTest.php +++ b/tests/Migration/ConfigTest.php @@ -121,7 +121,7 @@ private function createConsoleContainer(array $databases = []): Container 'class' => SqLiteConnection::class, '__construct()' => [ 'driver' => new SqLiteDriver( - 'sqlite:' . dirname(__DIR__, 2) . '/runtime/config-test.sq3', + 'sqlite:' . dirname(__DIR__, 2) . '/runtime/tests/config-test.sq3', ), ], ], diff --git a/tests/Migration/bin-runner.php b/tests/Migration/bin-runner.php index bb728538..58e34c62 100755 --- a/tests/Migration/bin-runner.php +++ b/tests/Migration/bin-runner.php @@ -5,4 +5,4 @@ $_composer_autoload_path = \dirname(__DIR__, 2) . '/vendor/autoload.php'; -require \dirname(__DIR__) . '/runtime/bin/vendor/yiisoft/db-migration/bin/yii-db-migration'; +require \dirname(__DIR__, 2) . '/runtime/tests/bin/vendor/yiisoft/db-migration/bin/yii-db-migration'; diff --git a/tests/Support/Helper/MigrationHelper.php b/tests/Support/Helper/MigrationHelper.php index d61d7fff..e9f9448e 100644 --- a/tests/Support/Helper/MigrationHelper.php +++ b/tests/Support/Helper/MigrationHelper.php @@ -15,11 +15,11 @@ final class MigrationHelper { - public const NAMESPACE = 'Yiisoft\\Db\\Migration\\Tests\\runtime\\MigrationNamespace'; + public const NAMESPACE = 'Yiisoft\\Db\\Migration\\Tests\\Runtime\\MigrationNamespace'; public static function getRuntimePath(): string { - return dirname(__DIR__, 2) . '/runtime/migration-path'; + return dirname(__DIR__, 3) . '/runtime/tests/migration-path'; } /** @@ -112,7 +112,7 @@ public static function createAndApplyMigration( public static function getPathForMigrationNamespace(): string { - return dirname(__DIR__, 2) . '/runtime/MigrationNamespace'; + return dirname(__DIR__, 3) . '/runtime/tests/MigrationNamespace'; } public static function resetPathAndNamespace(ContainerInterface $container): void @@ -135,7 +135,7 @@ private static function preparePaths(): void foreach ($paths as $path) { file_exists($path) ? FileHelper::clearDirectory($path) - : mkdir($path); + : FileHelper::ensureDirectory($path); } } }