rename Configuration\Configuration into Configuration\Migration

doctrine · Jan 14, 2020 · 6b39991 · 6b39991
1 parent f8fa939
commit 6b39991
Show file tree

Hide file tree

Showing 36 changed files with 74 additions and 65 deletions.
diff --git a/...tion/Configuration/ConfigurationArray.php → ...guration/Migration/ConfigurationArray.php b/...tion/Configuration/ConfigurationArray.php → ...guration/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/...ation/Configuration/ConfigurationFile.php → ...iguration/Migration/ConfigurationFile.php b/...ation/Configuration/ConfigurationFile.php → ...iguration/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/...uration/ConfigurationFileWithFallback.php → ...gration/ConfigurationFileWithFallback.php b/...uration/ConfigurationFileWithFallback.php → ...gration/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/...ion/Configuration/ConfigurationLoader.php → ...uration/Migration/ConfigurationLoader.php b/...ion/Configuration/ConfigurationLoader.php → ...uration/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/.../Exception/InvalidConfigurationFormat.php → .../Exception/InvalidConfigurationFormat.php b/.../Exception/InvalidConfigurationFormat.php → .../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/...ion/Exception/InvalidConfigurationKey.php → ...ion/Exception/InvalidConfigurationKey.php b/...ion/Exception/InvalidConfigurationKey.php → ...ion/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/.../Configuration/Exception/JsonNotValid.php → ...tion/Migration/Exception/JsonNotValid.php b/.../Configuration/Exception/JsonNotValid.php → ...tion/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/...on/Exception/MissingConfigurationFile.php → ...on/Exception/MissingConfigurationFile.php b/...on/Exception/MissingConfigurationFile.php → ...on/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/...n/Configuration/Exception/XmlNotValid.php → ...ation/Migration/Exception/XmlNotValid.php b/...n/Configuration/Exception/XmlNotValid.php → ...ation/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/...figuration/Exception/YamlNotAvailable.php → .../Migration/Exception/YamlNotAvailable.php b/...figuration/Exception/YamlNotAvailable.php → .../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/.../Configuration/Exception/YamlNotValid.php → ...tion/Migration/Exception/YamlNotValid.php b/.../Configuration/Exception/YamlNotValid.php → ...tion/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/...n/Configuration/ExistingConfiguration.php → ...ation/Migration/ExistingConfiguration.php b/...n/Configuration/ExistingConfiguration.php → ...ation/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/...iguration/Configuration/FormattedFile.php → ...Configuration/Migration/FormattedFile.php b/...iguration/Configuration/FormattedFile.php → ...Configuration/Migration/FormattedFile.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 function count;
@@ -46,7 +46,7 @@ public function getConfiguration() : Configuration
 
         $extension = pathinfo($this->file, PATHINFO_EXTENSION);
         if (! isset($this->loaders[$extension])) {
-            throw Configuration\Exception\InvalidConfigurationFormat::new($this->file);
+            throw Migration\Exception\InvalidConfigurationFormat::new($this->file);
         }
 
         return $this->loaders[$extension]($this->file)->getConfiguration();

diff --git a/.../Configuration/Configuration/JsonFile.php → ...ions/Configuration/Migration/JsonFile.php b/.../Configuration/Configuration/JsonFile.php → ...ions/Configuration/Migration/JsonFile.php
@@ -2,10 +2,9 @@
 
 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 function assert;
 use function file_exists;

diff --git a/...s/Configuration/Configuration/PhpFile.php → ...tions/Configuration/Migration/PhpFile.php b/...s/Configuration/Configuration/PhpFile.php → ...tions/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/...ation/Configuration/XML/configuration.xsd → ...iguration/Migration/XML/configuration.xsd b/...ation/Configuration/XML/configuration.xsd → ...iguration/Migration/XML/configuration.xsd
diff --git a/...s/Configuration/Configuration/XmlFile.php → ...tions/Configuration/Migration/XmlFile.php b/...s/Configuration/Configuration/XmlFile.php → ...tions/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/.../Configuration/Configuration/YamlFile.php → ...ions/Configuration/Migration/YamlFile.php b/.../Configuration/Configuration/YamlFile.php → ...ions/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
@@ -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
@@ -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
@@ -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/...uration/Configuration/ArrayLoaderTest.php → ...nfiguration/Migration/ArrayLoaderTest.php b/...uration/Configuration/ArrayLoaderTest.php → ...nfiguration/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/...ion/ConfigurationFileWithFallbackTest.php → ...ion/ConfigurationFileWithFallbackTest.php b/...ion/ConfigurationFileWithFallbackTest.php → ...ion/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/...ation/Configuration/FormattedFileTest.php → ...iguration/Migration/FormattedFileTest.php b/...ation/Configuration/FormattedFileTest.php → ...iguration/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/...guration/Configuration/JsonLoaderTest.php → ...onfiguration/Migration/JsonLoaderTest.php b/...guration/Configuration/JsonLoaderTest.php → ...onfiguration/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/...onfiguration/Configuration/LoaderTest.php → ...ts/Configuration/Migration/LoaderTest.php b/...onfiguration/Configuration/LoaderTest.php → ...ts/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/...iguration/Configuration/PhpLoaderTest.php → ...Configuration/Migration/PhpLoaderTest.php b/...iguration/Configuration/PhpLoaderTest.php → ...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/...iguration/Configuration/XmlLoaderTest.php → ...Configuration/Migration/XmlLoaderTest.php b/...iguration/Configuration/XmlLoaderTest.php → ...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/...guration/Configuration/YamlLoaderTest.php → ...onfiguration/Migration/YamlLoaderTest.php b/...guration/Configuration/YamlLoaderTest.php → ...onfiguration/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');
     }