Skip to content

[TASK] Rename the configuration directory to config/ #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2018
Merged

[TASK] Rename the configuration directory to config/ #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/;
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
0 Configuration/.gitkeep → config/.gitkeep
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions tests/Integration/Composer/ScriptsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}

/**
Expand Down Expand Up @@ -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';
}

/**
Expand All @@ -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');
}
}