Skip to content

Commit a8b93c7

Browse files
oliverkleeSam Tuke
authored and
Sam Tuke
committed
[TASK] Rename the configuration directory to config/ (#58)
This brings the project more in line with the default Symfony project structure.
1 parent 208153d commit a8b93c7

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ We will only merge pull requests that follow the project's coding style.
108108
Please check your code with the provided PHP_CodeSniffer standard:
109109

110110
```bash
111-
vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/
111+
vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/
112112
```
113113

114114
Please also check the code structure using PHPMD:
115115

116116
```bash
117-
vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml
117+
vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml
118118
```
119119

120120
And also please run the static code analysis:
@@ -126,7 +126,7 @@ vendor/bin/phpstan analyse -l 5 src/ tests/
126126
You can also run all code style checks using one long line from a bash shell:
127127

128128
```bash
129-
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/
129+
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/
130130
```
131131

132132
This will execute all tests except for the unit tests and the integration

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
/.webprj
66
/bin/
77
/composer.lock
8-
/Configuration/bundles.yml
9-
/Configuration/config_modules.yml
10-
/Configuration/parameters.yml
11-
/Configuration/routing_modules.yml
8+
/config/bundles.yml
9+
/config/config_modules.yml
10+
/config/parameters.yml
11+
/config/routing_modules.yml
1212
/nbproject
1313
/public/
1414
/var/

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ script:
8181
- >
8282
echo;
8383
echo "Running PHPMD";
84-
vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml;
84+
vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml;
8585
8686
- >
8787
echo;
8888
echo "Running PHP_CodeSniffer";
89-
vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/;
89+
vendor/bin/phpcs --standard=vendor/phplist/core/config/PhpCodeSniffer/ src/ tests/;

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1212
### Changed
1313
- Move the PHPUnit configuration file (#54)
1414
- Use the renamed phplist/core package (#53)
15-
- Adopt more of the default Symfony project structure (#49, #50, #51, #55)
15+
- Adopt more of the default Symfony project structure (#49, #50, #51, #55, #58)
1616

1717
### Deprecated
1818

File renamed without changes.

tests/Integration/Composer/ScriptsTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function binariesExist(string $fileName)
9292
*/
9393
private function getBundleConfigurationFilePath(): string
9494
{
95-
return dirname(__DIR__, 3) . '/Configuration/bundles.yml';
95+
return dirname(__DIR__, 3) . '/config/bundles.yml';
9696
}
9797

9898
/**
@@ -130,7 +130,7 @@ public function bundleConfigurationFileContainsModuleBundles(string $bundleClass
130130
*/
131131
private function getModuleRoutesConfigurationFilePath(): string
132132
{
133-
return dirname(__DIR__, 3) . '/Configuration/routing_modules.yml';
133+
return dirname(__DIR__, 3) . '/config/routing_modules.yml';
134134
}
135135

136136
/**
@@ -146,14 +146,14 @@ public function moduleRoutesConfigurationFileExists()
146146
*/
147147
public function parametersConfigurationFileExists()
148148
{
149-
static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/parameters.yml');
149+
static::assertFileExists(dirname(__DIR__, 3) . '/config/parameters.yml');
150150
}
151151

152152
/**
153153
* @test
154154
*/
155155
public function modulesConfigurationFileExists()
156156
{
157-
static::assertFileExists(dirname(__DIR__, 3) . '/Configuration/config_modules.yml');
157+
static::assertFileExists(dirname(__DIR__, 3) . '/config/config_modules.yml');
158158
}
159159
}

0 commit comments

Comments
 (0)