Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ code coverage of the fixed bugs and the new features.
To run the existing unit tests, run this command:

```bash
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml Tests/Unit/
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Unit/
```

### Running the integration tests
Expand All @@ -100,7 +100,7 @@ When running the integration tests, you will need to specify the database name
and access credentials on the command line (in the same line):

```bash
PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml Tests/Integration/
PHPLIST_DATABASE_NAME=phplist_test PHPLIST_DATABASE_USER=phplist PHPLIST_DATABASE_PASSWORD=batterystaple vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Integration/
```


Expand All @@ -116,7 +116,7 @@ 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/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ Tests/
vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ tests/
```

Please also check the code structure using PHPMD:
Expand All @@ -128,13 +128,13 @@ vendor/bin/phpmd Classes/ text vendor/phplist/phplist4-core/Configuration/PHPMD/
And also please run the static code analysis:

```bash
vendor/bin/phpstan analyse -l 5 Classes/ Tests/
vendor/bin/phpstan analyse -l 5 Classes/ tests/
```

You can also run all code style checks using one long line from a bash shell:

```bash
find Classes/ Tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 Classes/ Tests/ && vendor/bin/phpmd Classes/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ Tests/
find Classes/ tests/ -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l && vendor/bin/phpstan analyse -l 5 Classes/ tests/ && vendor/bin/phpmd Classes/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ tests/
```

This will execute all tests except for the unit tests and the integration
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Are your changes covered with unit tests, and do they not break anything?

You can run the existing unit tests using this command:

vendor/bin/phpunit Tests/
vendor/bin/phpunit tests/


### Code style
Expand All @@ -22,7 +22,7 @@ style?

You can check for this using this command:

vendor/bin/phpcs --standard=PSR2 Classes/ Tests/
vendor/bin/phpcs --standard=PSR2 Classes/ tests/


### Other Information
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,22 @@ script:
- >
echo;
echo "Linting all PHP files";
find Classes/ Tests/ -name ''*.php'' -print0 | xargs -0 -n 1 -P 4 php -l;
find Classes/ tests/ -name ''*.php'' -print0 | xargs -0 -n 1 -P 4 php -l;

- >
echo;
echo "Running the unit tests";
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml Tests/Unit/;
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Unit/;

- >
echo;
echo "Running the integration tests";
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml Tests/Integration/;
vendor/bin/phpunit -c Configuration/PHPUnit/phpunit.xml tests/Integration/;

- >
echo;
echo "Running the static analysis";
vendor/bin/phpstan analyse -l 5 Classes/ Tests/;
vendor/bin/phpstan analyse -l 5 Classes/ tests/;

- >
echo;
Expand All @@ -86,4 +86,4 @@ script:
- >
echo;
echo "Running PHP_CodeSniffer";
vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ Tests/;
vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ Classes/ tests/;
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
- REST action for getting all subscribers for a list (#83)

### Changed
- Adopt more of the default Symfony project structure (#92)

### Deprecated

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
},
"autoload-dev": {
"psr-4": {
"PhpList\\RestBundle\\Tests\\": "Tests/"
"PhpList\\RestBundle\\Tests\\": "tests/"
}
},
"scripts": {
Expand Down Expand Up @@ -84,7 +84,7 @@
"symfony-bin-dir": "bin",
"symfony-var-dir": "var",
"symfony-web-dir": "web",
"symfony-tests-dir": "Tests",
"symfony-tests-dir": "tests",
"phplist/phplist4-core": {
"bundles": [
"FOS\\RestBundle\\FOSRestBundle",
Expand Down