diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationArray.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php similarity index 96% rename from lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationArray.php rename to lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php index 441e8cc3f2..0d121f0fc1 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationArray.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationArray.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Closure; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\InvalidConfigurationKey; +use Doctrine\Migrations\Configuration\Migration\Exception\InvalidConfigurationKey; use Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration; use Doctrine\Migrations\Tools\BooleanStringFormatter; use function assert; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFile.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFile.php similarity index 92% rename from lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFile.php index feeb9518a0..2769b889c6 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFile.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use function dirname; use function realpath; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFileWithFallback.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php similarity index 91% rename from lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFileWithFallback.php rename to lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php index 7ba4a6344c..84dbe98af5 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationFileWithFallback.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationFileWithFallback.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\MissingConfigurationFile; +use Doctrine\Migrations\Configuration\Migration\Exception\MissingConfigurationFile; use Doctrine\Migrations\Tools\Console\Exception\FileTypeNotSupported; use function file_exists; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationLoader.php b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationLoader.php similarity index 75% rename from lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationLoader.php rename to lib/Doctrine/Migrations/Configuration/Migration/ConfigurationLoader.php index 680e603465..9eb47c69aa 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/ConfigurationLoader.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/ConfigurationLoader.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationFormat.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationFormat.php similarity index 85% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationFormat.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationFormat.php index e06c952b0f..fb4e5f1540 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationFormat.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationFormat.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationKey.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationKey.php similarity index 85% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationKey.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationKey.php index 075c4850f4..7f90160cba 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/InvalidConfigurationKey.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/InvalidConfigurationKey.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/JsonNotValid.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/JsonNotValid.php similarity index 82% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/JsonNotValid.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/JsonNotValid.php index 37cc0cf23f..63e0950522 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/JsonNotValid.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/JsonNotValid.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/MissingConfigurationFile.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/MissingConfigurationFile.php similarity index 83% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/MissingConfigurationFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/MissingConfigurationFile.php index ef6f6b37ec..d8606a835d 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/MissingConfigurationFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/MissingConfigurationFile.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/XmlNotValid.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/XmlNotValid.php similarity index 87% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/XmlNotValid.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/XmlNotValid.php index afb7173881..a885734ba0 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/XmlNotValid.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/XmlNotValid.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotAvailable.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotAvailable.php similarity index 86% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotAvailable.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotAvailable.php index 8307980381..20912ff9d7 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotAvailable.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotAvailable.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotValid.php b/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotValid.php similarity index 86% rename from lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotValid.php rename to lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotValid.php index e2789fca72..ad5b11e61b 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/Exception/YamlNotValid.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/Exception/YamlNotValid.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration\Exception; +namespace Doctrine\Migrations\Configuration\Migration\Exception; use Doctrine\Migrations\Configuration\Exception\ConfigurationException; use LogicException; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/ExistingConfiguration.php b/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php similarity index 88% rename from lib/Doctrine/Migrations/Configuration/Configuration/ExistingConfiguration.php rename to lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php index ffb10ee028..75440da111 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/ExistingConfiguration.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/ExistingConfiguration.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/FormattedFile.php b/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php similarity index 87% rename from lib/Doctrine/Migrations/Configuration/Configuration/FormattedFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php index 77e8a663a3..026276f79a 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/FormattedFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/FormattedFile.php @@ -2,9 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; +use Doctrine\Migrations\Configuration\Migration\Exception\InvalidConfigurationFormat; use function count; use function pathinfo; use const PATHINFO_EXTENSION; @@ -46,7 +47,7 @@ public function getConfiguration() : Configuration $extension = pathinfo($this->file, PATHINFO_EXTENSION); if (! isset($this->loaders[$extension])) { - throw Configuration\Exception\InvalidConfigurationFormat::new($this->file); + throw InvalidConfigurationFormat::new($this->file); } return $this->loaders[$extension]($this->file)->getConfiguration(); diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/JsonFile.php b/lib/Doctrine/Migrations/Configuration/Migration/JsonFile.php similarity index 88% rename from lib/Doctrine/Migrations/Configuration/Configuration/JsonFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/JsonFile.php index eab8764f25..f8ec625b47 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/JsonFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/JsonFile.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\JsonNotValid; use Doctrine\Migrations\Configuration\Exception\FileNotFound; +use Doctrine\Migrations\Configuration\Migration\Exception\JsonNotValid; use function assert; use function file_exists; use function file_get_contents; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/PhpFile.php b/lib/Doctrine/Migrations/Configuration/Migration/PhpFile.php similarity index 93% rename from lib/Doctrine/Migrations/Configuration/Configuration/PhpFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/PhpFile.php index 25e5f1dfe3..0214622bc0 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/PhpFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/PhpFile.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Exception\FileNotFound; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/XML/configuration.xsd b/lib/Doctrine/Migrations/Configuration/Migration/XML/configuration.xsd similarity index 100% rename from lib/Doctrine/Migrations/Configuration/Configuration/XML/configuration.xsd rename to lib/Doctrine/Migrations/Configuration/Migration/XML/configuration.xsd diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/XmlFile.php b/lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php similarity index 96% rename from lib/Doctrine/Migrations/Configuration/Configuration/XmlFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php index 1f9d4b6fd3..1f148c7d0c 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/XmlFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\XmlNotValid; use Doctrine\Migrations\Configuration\Exception\FileNotFound; +use Doctrine\Migrations\Configuration\Migration\Exception\XmlNotValid; use Doctrine\Migrations\Tools\BooleanStringFormatter; use DOMDocument; use SimpleXMLElement; diff --git a/lib/Doctrine/Migrations/Configuration/Configuration/YamlFile.php b/lib/Doctrine/Migrations/Configuration/Migration/YamlFile.php similarity index 85% rename from lib/Doctrine/Migrations/Configuration/Configuration/YamlFile.php rename to lib/Doctrine/Migrations/Configuration/Migration/YamlFile.php index e28a604c24..e3c7c402cb 100644 --- a/lib/Doctrine/Migrations/Configuration/Configuration/YamlFile.php +++ b/lib/Doctrine/Migrations/Configuration/Migration/YamlFile.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Configuration\Configuration; +namespace Doctrine\Migrations\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\YamlNotAvailable; -use Doctrine\Migrations\Configuration\Configuration\Exception\YamlNotValid; use Doctrine\Migrations\Configuration\Exception\FileNotFound; +use Doctrine\Migrations\Configuration\Migration\Exception\YamlNotAvailable; +use Doctrine\Migrations\Configuration\Migration\Exception\YamlNotValid; use Symfony\Component\Yaml\Exception\ParseException; use Symfony\Component\Yaml\Yaml; use function assert; diff --git a/lib/Doctrine/Migrations/DependencyFactory.php b/lib/Doctrine/Migrations/DependencyFactory.php index d0a44f42ac..3043f5ebc5 100644 --- a/lib/Doctrine/Migrations/DependencyFactory.php +++ b/lib/Doctrine/Migrations/DependencyFactory.php @@ -8,6 +8,7 @@ use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ConnectionLoader; use Doctrine\Migrations\Configuration\EntityManager\EntityManagerLoader; +use Doctrine\Migrations\Configuration\Migration\ConfigurationLoader; use Doctrine\Migrations\Exception\FrozenDependencies; use Doctrine\Migrations\Exception\MissingDependency; use Doctrine\Migrations\Finder\GlobFinder; @@ -73,7 +74,7 @@ class DependencyFactory /** @var bool */ private $frozen = false; - /** @var Configuration\ConfigurationLoader */ + /** @var ConfigurationLoader */ private $configurationLoader; /** @var ConnectionLoader */ @@ -83,7 +84,7 @@ class DependencyFactory private $emLoader; public static function fromConnection( - Configuration\ConfigurationLoader $configurationLoader, + ConfigurationLoader $configurationLoader, ConnectionLoader $connectionLoader, ?LoggerInterface $logger = null ) : self { @@ -95,7 +96,7 @@ public static function fromConnection( } public static function fromEntityManager( - Configuration\ConfigurationLoader $configurationLoader, + ConfigurationLoader $configurationLoader, EntityManagerLoader $emLoader, ?LoggerInterface $logger = null ) : self { diff --git a/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php b/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php index d722b09d87..644dc84f89 100644 --- a/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php +++ b/lib/Doctrine/Migrations/Tools/Console/Command/DoctrineCommand.php @@ -4,8 +4,8 @@ namespace Doctrine\Migrations\Tools\Console\Command; -use Doctrine\Migrations\Configuration\Configuration\ConfigurationFileWithFallback; use Doctrine\Migrations\Configuration\Connection\ConfigurationFile; +use Doctrine\Migrations\Configuration\Migration\ConfigurationFileWithFallback; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Tools\Console\ConsoleLogger; use Doctrine\Migrations\Tools\Console\Exception\DependenciesNotSatisfied; diff --git a/phpstan.neon.dist b/phpstan.neon.dist index cbbc01e166..874215621d 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -17,7 +17,7 @@ parameters: path: %currentWorkingDirectory%/lib/Doctrine/Migrations/Version/SortedMigrationPlanCalculator.php - message: '~^Variable property access on mixed\.$~' - path: %currentWorkingDirectory%/lib/Doctrine/Migrations/Configuration/Configuration/XmlFile.php + path: %currentWorkingDirectory%/lib/Doctrine/Migrations/Configuration/Migration/XmlFile.php - message: '~^Call to function is_bool\(\) with bool will always evaluate to true\.$~' path: %currentWorkingDirectory%/lib/Doctrine/Migrations/InlineParameterFormatter.php diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/ArrayLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/ArrayLoaderTest.php similarity index 65% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/ArrayLoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/ArrayLoaderTest.php index e8471a045c..de4c6cbdd3 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/ArrayLoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/ArrayLoaderTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; -use Doctrine\Migrations\Configuration\Configuration\ConfigurationArray; -use Doctrine\Migrations\Configuration\Configuration\Exception\InvalidConfigurationKey; +use Doctrine\Migrations\Configuration\Migration\ConfigurationArray; +use Doctrine\Migrations\Configuration\Migration\Exception\InvalidConfigurationKey; use PHPUnit\Framework\TestCase; class ArrayLoaderTest extends TestCase diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/ConfigurationFileWithFallbackTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php similarity index 84% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/ConfigurationFileWithFallbackTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php index 09971c40c2..1937a367f1 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/ConfigurationFileWithFallbackTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/ConfigurationFileWithFallbackTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; -use Doctrine\Migrations\Configuration\Configuration\ConfigurationFileWithFallback; -use Doctrine\Migrations\Configuration\Configuration\Exception\MissingConfigurationFile; +use Doctrine\Migrations\Configuration\Migration\ConfigurationFileWithFallback; +use Doctrine\Migrations\Configuration\Migration\Exception\MissingConfigurationFile; use PHPUnit\Framework\TestCase; use function chdir; use function getcwd; diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/FormattedFileTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/FormattedFileTest.php similarity index 59% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/FormattedFileTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/FormattedFileTest.php index 138e7e8fc8..7eb5605d0a 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/FormattedFileTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/FormattedFileTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; -use Doctrine\Migrations\Configuration\Configuration\Exception\InvalidConfigurationFormat; -use Doctrine\Migrations\Configuration\Configuration\FormattedFile; +use Doctrine\Migrations\Configuration\Migration\Exception\InvalidConfigurationFormat; +use Doctrine\Migrations\Configuration\Migration\FormattedFile; use PHPUnit\Framework\TestCase; class FormattedFileTest extends TestCase diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/JsonLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php similarity index 64% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/JsonLoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php index 3fed01c599..e07290bb06 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/JsonLoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/JsonLoaderTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\JsonFile; +use Doctrine\Migrations\Configuration\Migration\Exception\JsonNotValid; +use Doctrine\Migrations\Configuration\Migration\JsonFile; class JsonLoaderTest extends LoaderTest { @@ -18,7 +19,7 @@ public function load(string $prefix = '') : Configuration public function testMalformed() : void { - $this->expectException(Configuration\Exception\JsonNotValid::class); + $this->expectException(JsonNotValid::class); $this->load('malformed'); } } diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/LoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/LoaderTest.php similarity index 96% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/LoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/LoaderTest.php index 06ec9b713a..8b0334d720 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/LoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/LoaderTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\Exception\InvalidConfigurationKey; +use Doctrine\Migrations\Configuration\Migration\Exception\InvalidConfigurationKey; use Doctrine\Migrations\Exception\MigrationException; use Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration; use InvalidArgumentException; diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/PhpLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php similarity index 80% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/PhpLoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php index 7afd1fc618..b05373dd7a 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/PhpLoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/PhpLoaderTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\PhpFile; +use Doctrine\Migrations\Configuration\Migration\PhpFile; class PhpLoaderTest extends LoaderTest { diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/XmlLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php similarity index 65% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/XmlLoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php index 2aaab94c7b..ea70a50766 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/XmlLoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/XmlLoaderTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\XmlFile; +use Doctrine\Migrations\Configuration\Migration\Exception\XmlNotValid; +use Doctrine\Migrations\Configuration\Migration\XmlFile; class XmlLoaderTest extends LoaderTest { @@ -18,14 +19,14 @@ public function load(string $prefix = '') : Configuration public function testConfigurationWithInvalidOption() : void { - $this->expectException(Configuration\Exception\XmlNotValid::class); + $this->expectException(XmlNotValid::class); $this->load('invalid'); } public function testMalformed() : void { - $this->expectException(Configuration\Exception\XmlNotValid::class); + $this->expectException(XmlNotValid::class); $this->load('malformed'); } diff --git a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/YamlLoaderTest.php b/tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php similarity index 64% rename from tests/Doctrine/Migrations/Tests/Configuration/Configuration/YamlLoaderTest.php rename to tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php index 54efe2a6e4..b1187847a5 100644 --- a/tests/Doctrine/Migrations/Tests/Configuration/Configuration/YamlLoaderTest.php +++ b/tests/Doctrine/Migrations/Tests/Configuration/Migration/YamlLoaderTest.php @@ -2,10 +2,11 @@ declare(strict_types=1); -namespace Doctrine\Migrations\Tests\Configuration\Configuration; +namespace Doctrine\Migrations\Tests\Configuration\Migration; use Doctrine\Migrations\Configuration\Configuration; -use Doctrine\Migrations\Configuration\Configuration\YamlFile; +use Doctrine\Migrations\Configuration\Migration\Exception\YamlNotValid; +use Doctrine\Migrations\Configuration\Migration\YamlFile; class YamlLoaderTest extends LoaderTest { @@ -18,7 +19,7 @@ public function load(string $prefix = '') : Configuration public function testMalformed() : void { - $this->expectException(Configuration\Exception\YamlNotValid::class); + $this->expectException(YamlNotValid::class); $this->load('malformed'); } diff --git a/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php b/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php index e7c8f38c34..09d3a1d270 100644 --- a/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php +++ b/tests/Doctrine/Migrations/Tests/DependencyFactoryTest.php @@ -8,6 +8,7 @@ use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Exception\FrozenDependencies; use Doctrine\Migrations\Exception\MissingDependency; @@ -44,7 +45,7 @@ public function testFreeze() : void { $this->configuration->addMigrationsDirectory('foo', 'bar'); - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); $di->freeze(); $this->expectException(FrozenDependencies::class); @@ -56,7 +57,7 @@ public function testFinderForYearMonthStructure() : void { $this->configuration->setMigrationsAreOrganizedByYearAndMonth(true); - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); $finder = $di->getMigrationsFinder(); self::assertInstanceOf(RecursiveRegexFinder::class, $finder); @@ -66,7 +67,7 @@ public function testFinderForYearStructure() : void { $this->configuration->setMigrationsAreOrganizedByYear(true); - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); $finder = $di->getMigrationsFinder(); self::assertInstanceOf(RecursiveRegexFinder::class, $finder); @@ -75,7 +76,7 @@ public function testFinderForYearStructure() : void public function testFinder() : void { $this->configuration = new Configuration(); - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); $finder = $di->getMigrationsFinder(); self::assertInstanceOf(GlobFinder::class, $finder); @@ -83,7 +84,7 @@ public function testFinder() : void public function testConnection() : void { - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); self::assertSame($this->connection, $di->getConnection()); self::assertFalse($di->hasEntityManager()); @@ -93,13 +94,13 @@ public function testNoEntityManagerRaiseException() : void { $this->expectException(MissingDependency::class); - $di = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); + $di = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($this->connection)); $di->getEntityManager(); } public function testEntityManager() : void { - $di = DependencyFactory::fromEntityManager(new Configuration\ExistingConfiguration($this->configuration), new ExistingEntityManager($this->entityManager)); + $di = DependencyFactory::fromEntityManager(new ExistingConfiguration($this->configuration), new ExistingEntityManager($this->entityManager)); self::assertTrue($di->hasEntityManager()); self::assertSame($this->entityManager, $di->getEntityManager()); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php index c3ae74710f..d1d5084106 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/LatestCommandTest.php @@ -7,6 +7,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Metadata\Storage\MetadataStorage; use Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration; @@ -44,7 +45,7 @@ protected function setUp() : void $conn = $this->getSqliteConnection(); $dependencyFactory = DependencyFactory::fromConnection( - new Configuration\ExistingConfiguration($configuration), + new ExistingConfiguration($configuration), new ExistingConnection($conn) ); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php index 932c176bfc..93a97e2492 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrateCommandTest.php @@ -7,6 +7,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DbalMigrator; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Metadata\MigrationPlanList; @@ -278,7 +279,7 @@ protected function setUp() : void $connection = $this->getSqliteConnection(); - $this->dependencyFactory = DependencyFactory::fromConnection(new Configuration\ExistingConfiguration($this->configuration), new ExistingConnection($connection)); + $this->dependencyFactory = DependencyFactory::fromConnection(new ExistingConfiguration($this->configuration), new ExistingConnection($connection)); $this->queryWriter = $this->createMock(QueryWriter::class); $this->dependencyFactory->setService(QueryWriter::class, $this->queryWriter); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php index 0fd28c14f3..73cd225b74 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/MigrationVersionTest.php @@ -7,6 +7,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Metadata\Storage\MetadataStorage; use Doctrine\Migrations\MigrationRepository; @@ -45,7 +46,7 @@ protected function setUp() : void $logger = new TestLogger(); $dependencyFactory = DependencyFactory::fromConnection( - new Configuration\ExistingConfiguration($configuration), + new ExistingConfiguration($configuration), new ExistingConnection($conn), $logger ); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php index 88b2ecf0e3..b5e4be0b56 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/StatusCommandTest.php @@ -8,6 +8,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Metadata\Storage\MetadataStorage; use Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration; @@ -49,7 +50,7 @@ protected function setUp() : void $conn = $this->getSqliteConnection(); $dependencyFactory = DependencyFactory::fromConnection( - new Configuration\ExistingConfiguration($configuration), + new ExistingConfiguration($configuration), new ExistingConnection($conn) ); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php index 60471c0329..bbe2e84ee8 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/Command/UpToDateCommandTest.php @@ -8,6 +8,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\Migrations\Configuration\Configuration; use Doctrine\Migrations\Configuration\Connection\ExistingConnection; +use Doctrine\Migrations\Configuration\Migration\ExistingConfiguration; use Doctrine\Migrations\DependencyFactory; use Doctrine\Migrations\Exception\MigrationException; use Doctrine\Migrations\Metadata\Storage\MetadataStorage; @@ -52,7 +53,7 @@ protected function setUp() : void $this->conn = $this->getSqliteConnection(); $dependencyFactory = DependencyFactory::fromConnection( - new Configuration\ExistingConfiguration($configuration), + new ExistingConfiguration($configuration), new ExistingConnection($this->conn) ); diff --git a/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php b/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php index ba3f5a601a..fafe0c222f 100644 --- a/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php +++ b/tests/Doctrine/Migrations/Tests/Tools/Console/config/cli-config.php @@ -4,8 +4,8 @@ use Doctrine\Common\Persistence\Mapping\Driver\PHPDriver; use Doctrine\DBAL\DriverManager; -use Doctrine\Migrations\Configuration\Configuration\ConfigurationArray; use Doctrine\Migrations\Configuration\EntityManager\ExistingEntityManager; +use Doctrine\Migrations\Configuration\Migration\ConfigurationArray; use Doctrine\Migrations\DependencyFactory; use Doctrine\ORM\Configuration; use Doctrine\ORM\EntityManager;