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

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

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -108,13 +108,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:
@@ -125,7 +125,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
@@ -4,10 +4,10 @@
 /.project
 /.webprj
 /bin/
-/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
@@ -73,9 +73,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
@@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Changed
 - Move the PHPUnit configuration file (#78)
 - Use the renamed phplist/core package (#77)
-- Adopt more of the default Symfony project structure (#73, #74, #75, #79)
+- Adopt more of the default Symfony project structure (#73, #74, #75, #79, #82)
 
 ### Deprecated
 

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ run in development and testing mode, while Apache can run in production mode.
 Then reload or restart Apache to activate the configuration changes.
 
 If you cannot set any environment variables in your Apache configuration, you
-can also set the database credentials in `Configuration/parameters.yml`.
+can also set the database credentials in `config/parameters.yml`.
 However, this should only be used as a last resort as this reduces security (as an
 attacker with read access to the files on the web server then could read that
 file, whereas they then still would not be able to access the environment

diff --git a/composer.lock b/composer.lock
diff --git a/Configuration/.gitkeep → config/.gitkeep b/Configuration/.gitkeep → config/.gitkeep
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';
     }
 
     /**
@@ -130,7 +130,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';
     }
 
     /**
@@ -146,14 +146,14 @@ public function moduleRoutesConfigurationFileExists()
      */
     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');
     }
 }