diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ecc3ce9..fc97d12 100644 --- 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: @@ -126,7 +126,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 index f00fc74..9cd86d7 100644 --- 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 index 4c84294..2a2fbc5 100644 --- 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 index 1493afd..66b030e 100644 --- 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 (#54) - Use the renamed phplist/core package (#53) -- Adopt more of the default Symfony project structure (#49, #50, #51, #55) +- Adopt more of the default Symfony project structure (#49, #50, #51, #55, #58) ### Deprecated diff --git a/Configuration/.gitkeep b/config/.gitkeep similarity index 100% rename from Configuration/.gitkeep rename to config/.gitkeep diff --git a/tests/Integration/Composer/ScriptsTest.php b/tests/Integration/Composer/ScriptsTest.php index ad2dfd2..8d4d915 100644 --- 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,7 +146,7 @@ public function moduleRoutesConfigurationFileExists() */ public function parametersConfigurationFileExists() { - static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/parameters.yml'); + static::assertFileExists(dirname(__DIR__, 3) . '/config/parameters.yml'); } /** @@ -154,6 +154,6 @@ public function parametersConfigurationFileExists() */ public function modulesConfigurationFileExists() { - static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/config_modules.yml'); + static::assertFileExists(dirname(__DIR__, 3) . '/config/config_modules.yml'); } }