Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit 198463d

Browse files
committed
Merge pull request #24 from Koopzington/new-coding-standard
New coding standard Conflicts: composer.json composer.lock phpcs.xml src/AbstractValue.php src/Client.php
2 parents 1ef8124 + ae66117 commit 198463d

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ install:
8484
- stty cols 120 && composer show
8585

8686
script:
87-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi
88-
- if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
87+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
8988
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
9089

9190
after_script:

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,24 @@ To do so:
7777

7878
## Running Coding Standards Checks
7979

80-
This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
80+
This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
8181
standards checks, and provides configuration for our selected checks.
82-
`php-cs-fixer` is installed by default via Composer.
82+
`phpcs` is installed by default via Composer.
8383

8484
To run checks only:
8585

8686
```console
87-
$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
87+
$ composer cs-check
8888
```
8989

90-
To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
91-
flag:
90+
`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
91+
9292

9393
```console
94-
$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
94+
$ composer cs-fix
9595
```
9696

97-
If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
97+
If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
9898
they pass, and make sure you add and commit the changes after verification.
9999

100100
## Recommended Workflow for Contributions

phpcs.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@
55
<!-- Paths to check -->
66
<file>src</file>
77
<file>test</file>
8-
<exclude-pattern>test/_files/*</exclude-pattern>
9-
<exclude-pattern>test/TestAsset/*</exclude-pattern>
108
</ruleset>

0 commit comments

Comments
 (0)