[TASK] Rename the configuration directory to config/ (#106)

This brings the project more in line with the default Symfony project structure.
phpList · Mar 9, 2018 · e533f09 · e533f09
1 parent 6feaf79
commit e533f09
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -100,7 +100,7 @@ When running the integration tests, you will need to specify the database name
 and access credentials on the command line (in the same line):
 
 ```bash
-PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Integration/
+PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit -c config/PHPUnit/phpunit.xml tests/Integration/
 ```
 
 
@@ -116,13 +116,13 @@ We will only merge pull requests that follow the project's coding style.
 Please check your code with the provided PHP_CodeSniffer standard:
 
 ```bash
-vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/
+vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
 ```
 
 Please also check the code structure using PHPMD:
 
 ```bash
-vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml
+vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml
 ```
 
 And also please run the static code analysis:
@@ -134,7 +134,7 @@ vendor/bin/phpstan analyse -l 5 src/ tests/
 You can also run all code style checks using one long line from a bash shell:
 
 ```bash
-find src/ tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 src/ tests/ && vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/
+find src/ tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 src/ tests/ && vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
 ```
 
 This will execute all tests except for the unit tests and the integration

diff --git a/.gitignore b/.gitignore
@@ -5,10 +5,10 @@
 /.webprj
 /bin/
 /composer.lock
-/Configuration/bundles.yml
-/Configuration/config_modules.yml
-/Configuration/parameters.yml
-/Configuration/routing_modules.yml
+/config/bundles.yml
+/config/config_modules.yml
+/config/parameters.yml
+/config/routing_modules.yml
 /nbproject
 /public/
 /var/

diff --git a/.travis.yml b/.travis.yml
@@ -81,9 +81,9 @@ script:
 - >
   echo;
   echo "Running PHPMD";
-  vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml;
+  vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml;
 
 - >
   echo;
   echo "Running PHP_CodeSniffer";
-  vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/;
+  vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Changed
 - Move the PHPUnit configuration file (#99)
 - Use the renamed phplist/core package (#97)
-- Adopt more of the default Symfony project structure (#92, #93, #94, #95, #102)
+- Adopt more of the default Symfony project structure (#92, #93, #94, #95, #102, #106)
 
 ### Deprecated
 

diff --git a/Configuration/services.yml → config/services.yml b/Configuration/services.yml → config/services.yml
diff --git a/src/DependencyInjection/PhpListRestExtension.php b/src/DependencyInjection/PhpListRestExtension.php
@@ -30,10 +30,7 @@ public function load(array $configs, ContainerBuilder $containerBuilder)
         // This parameter is unused, but not optional. This line will avoid a static analysis warning this.
         $configs;
 
-        $loader = new YamlFileLoader(
-            $containerBuilder,
-            new FileLocator(__DIR__ . '/../../Configuration')
-        );
+        $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__ . '/../../config'));
         $loader->load('services.yml');
     }
 }
diff --git a/tests/Integration/Composer/ScriptsTest.php b/tests/Integration/Composer/ScriptsTest.php
@@ -92,7 +92,7 @@ public function binariesExist(string $fileName)
      */
     private function getBundleConfigurationFilePath(): string
     {
-        return dirname(__DIR__, 3) . '/Configuration/bundles.yml';
+        return dirname(__DIR__, 3) . '/config/bundles.yml';
     }
 
     /**
@@ -131,7 +131,7 @@ public function bundleConfigurationFileContainsModuleBundles(string $bundleClass
      */
     private function getModuleRoutesConfigurationFilePath(): string
     {
-        return dirname(__DIR__, 3) . '/Configuration/routing_modules.yml';
+        return dirname(__DIR__, 3) . '/config/routing_modules.yml';
     }
 
     /**
@@ -171,14 +171,14 @@ public function moduleRoutesConfigurationFileContainsModuleRoutes(string $routeS
      */
     public function parametersConfigurationFileExists()
     {
-        static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/parameters.yml');
+        static::assertFileExists(dirname(__DIR__, 3) . '/config/parameters.yml');
     }
 
     /**
      * @test
      */
     public function modulesConfigurationFileExists()
     {
-        static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/config_modules.yml');
+        static::assertFileExists(dirname(__DIR__, 3) . '/config/config_modules.yml');
     }
 }