Skip to content

Commit 6f361d0

Browse files
oliverkleeSam Tuke
authored andcommitted
[TASK] Rename the configuration directory to config/ (#291)
This brings the project more in line with the default Symfony project structure.
1 parent 01ee312 commit 6f361d0

File tree

21 files changed

+35
-35
lines changed

21 files changed

+35
-35
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mysql -u phplist_test --password=batterystaple phplist_test < resources/Database
9797
```
9898

9999
For running the integration tests, please first enter the database name
100-
and access credentials in `Configuration/parameters.yml`.
100+
and access credentials in `config/parameters.yml`.
101101

102102
After that has been done, you can run the integration tests:
103103

@@ -118,13 +118,13 @@ We will only merge pull requests that follow the project's coding style.
118118
Please check your code with the provided PHP_CodeSniffer standard:
119119

120120
```bash
121-
vendor/bin/phpcs --standard=Configuration/PhpCodeSniffer/ bin/ src/ tests/ public/
121+
vendor/bin/phpcs --standard=config/PhpCodeSniffer/ bin/ src/ tests/ public/
122122
```
123123

124124
Please also check the code structure using PHPMD:
125125

126126
```bash
127-
vendor/bin/phpmd src/ text Configuration/PHPMD/rules.xml
127+
vendor/bin/phpmd src/ text config/PHPMD/rules.xml
128128
```
129129

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

138138
```bash
139-
find src/ tests/ public/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && php -l bin/* && vendor/bin/phpstan analyse -l 5 bin/ src/ tests/ public/ && vendor/bin/phpmd src/ text Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=Configuration/PhpCodeSniffer/ bin/ src/ tests/ public/
139+
find src/ tests/ public/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && php -l bin/* && vendor/bin/phpstan analyse -l 5 bin/ src/ tests/ public/ && vendor/bin/phpmd src/ text config/PHPMD/rules.xml && vendor/bin/phpcs --standard=config/PhpCodeSniffer/ bin/ src/ tests/ public/
140140
```
141141

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

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
/.web-server-pid
66
/.webprj
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
/var/
1414
/vendor/

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ script:
8484
- >
8585
echo;
8686
echo "Running PHPMD";
87-
vendor/bin/phpmd src/ text Configuration/PHPMD/rules.xml;
87+
vendor/bin/phpmd src/ text config/PHPMD/rules.xml;
8888
8989
- >
9090
echo;
9191
echo "Running PHP_CodeSniffer";
92-
vendor/bin/phpcs --standard=Configuration/PhpCodeSniffer/ bin/ src/ tests/ public/;
92+
vendor/bin/phpcs --standard=config/PhpCodeSniffer/ bin/ src/ tests/ public/;

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
2020
- Move the PHPUnit configuration file (#283)
2121
- Rename the Composer package to "phplist/core" (#275)
2222
- Remove the obsolete core classes (#267)
23-
- Adopt more of the default Symfony project structure (#265, #268, #269, #270, #285)
23+
- Adopt more of the default Symfony project structure (#265, #268, #269, #270, #285, #291)
2424

2525
### Deprecated
2626

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ this code.
6464
The phpList application is configured so that the built-in PHP web server can
6565
run in development and testing mode, while Apache can run in production mode.
6666

67-
Please first set the database credentials in `Configuration/parameters.yml`.
67+
Please first set the database credentials in `config/parameters.yml`.
6868

6969
### Development
7070

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ framework:
1212
#translator: { fallbacks: ['%locale%'] }
1313
secret: '%secret%'
1414
router:
15-
resource: '%kernel.project_dir%/Configuration/routing.yml'
15+
resource: '%kernel.project_dir%/config/routing.yml'
1616
strict_requirements: ~
1717
form: ~
1818
csrf_protection: ~
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ imports:
33

44
framework:
55
router:
6-
resource: '%kernel.project_dir%/Configuration/routing_dev.yml'
6+
resource: '%kernel.project_dir%/config/routing_dev.yml'
77
strict_requirements: true
88
profiler: { only_exceptions: false }
99

0 commit comments

Comments
 (0)