Skip to content

Commit c7d09f0

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

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
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:
@@ -125,7 +125,7 @@ vendor/bin/phpstan analyse -l 5 src/ tests/
125125

126126
You can also run all code style checks using one long line from a bash shell:
127127
```bash
128-
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/
128+
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/
129129
```
130130

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

.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
/.project
55
/.webprj
66
/bin/
7-
/Configuration/bundles.yml
8-
/Configuration/config_modules.yml
9-
/Configuration/parameters.yml
10-
/Configuration/routing_modules.yml
7+
/config/bundles.yml
8+
/config/config_modules.yml
9+
/config/parameters.yml
10+
/config/routing_modules.yml
1111
/nbproject
1212
/public/
1313
/var/

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ script:
7373
- >
7474
echo;
7575
echo "Running PHPMD";
76-
vendor/bin/phpmd src/ text vendor/phplist/core/Configuration/PHPMD/rules.xml;
76+
vendor/bin/phpmd src/ text vendor/phplist/core/config/PHPMD/rules.xml;
7777
7878
- >
7979
echo;
8080
echo "Running PHP_CodeSniffer";
81-
vendor/bin/phpcs --standard=vendor/phplist/core/Configuration/PhpCodeSniffer/ src/ tests/;
81+
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 (#78)
1414
- Use the renamed phplist/core package (#77)
15-
- Adopt more of the default Symfony project structure (#73, #74, #75, #79)
15+
- Adopt more of the default Symfony project structure (#73, #74, #75, #79, #82)
1616

1717
### Deprecated
1818

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ run in development and testing mode, while Apache can run in production mode.
8181
Then reload or restart Apache to activate the configuration changes.
8282

8383
If you cannot set any environment variables in your Apache configuration, you
84-
can also set the database credentials in `Configuration/parameters.yml`.
84+
can also set the database credentials in `config/parameters.yml`.
8585
However, this should only be used as a last resort as this reduces security (as an
8686
attacker with read access to the files on the web server then could read that
8787
file, whereas they then still would not be able to access the environment

composer.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
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)