Merge branch 'hotfix/57'

Author: heiglandreas

.php_cs

@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#57](https://github.com/zendframework/zend-ldap/pull/57) adds support for new
+coding-standards.
 
 ### Deprecated
 

CHANGELOG.md

@@ -102,24 +102,24 @@ When done, you can halt the LDAP server using `vagrant halt`.
 
 ## Running Coding Standards Checks
 
-This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
 standards checks, and provides configuration for our selected checks.
-`php-cs-fixer` is installed by default via Composer.
+`phpcs` is installed by default via Composer.
 
 To run checks only:
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+$ composer cs-check
 ```
 
-To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
-flag:
+`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
+
 
 ```console
-$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+$ composer cs-fix
 ```
 
-If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions

CONTRIBUTING.md

@@ -20,9 +20,10 @@
         "zendframework/zend-config": "^2.5",
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "^4.5",
-        "php-mock/php-mock-phpunit": "~0.3"
+        "php-mock/php-mock-phpunit": "~0.3",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "phpunit/phpunit": "^4.6"
     },
     "suggest": {
         "zendframework/zend-eventmanager": "Zend\\EventManager component"
@@ -45,10 +46,10 @@
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
-        "cs-check": "php-cs-fixer --version && php-cs-fixer fix -v --diff --dry-run",
-        "cs-fix": "php-cs-fixer fix -v",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
 }