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
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,25 +116,25 @@ 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/ src/ tests/
```

Please also check the code structure using PHPMD:

```bash
vendor/bin/phpmd Classes/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml
vendor/bin/phpmd src/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml
```

And also please run the static code analysis:

```bash
vendor/bin/phpstan analyse -l 5 Classes/ tests/
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 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 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/phplist4-core/Configuration/PHPMD/rules.xml && vendor/bin/phpcs --standard=vendor/phplist/phplist4-core/Configuration/PhpCodeSniffer/ src/ tests/
```

This will execute all tests except for the unit tests and the integration
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 src/ tests/


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

- >
echo;
Expand All @@ -76,14 +76,14 @@ script:
- >
echo;
echo "Running the static analysis";
vendor/bin/phpstan analyse -l 5 Classes/ tests/;
vendor/bin/phpstan analyse -l 5 src/ tests/;

- >
echo;
echo "Running PHPMD";
vendor/bin/phpmd Classes/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml;
vendor/bin/phpmd src/ text vendor/phplist/phplist4-core/Configuration/PHPMD/rules.xml;

- >
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/ src/ tests/;
2 changes: 1 addition & 1 deletion Configuration/services.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
PhpList\RestBundle\Controller\:
resource: '../Classes/Controller'
resource: '../src/Controller'
public: true
autowire: true
tags: ['controller.service_arguments']
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"autoload": {
"psr-4": {
"PhpList\\RestBundle\\": "Classes/"
"PhpList\\RestBundle\\": "src/"
}
},
"autoload-dev": {
Expand Down
File renamed without changes.