Merge pull request #6964 from doctrine/cs

[CS] Ported lib/ to updated CS 2.0
doctrine · Jan 11, 2018 · e3936d0 · e3936d0
2 parents 8be1e3f + dc7fca4
commit e3936d0
Show file tree

Hide file tree

Showing 404 changed files with 3,599 additions and 7,202 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -81,9 +81,10 @@ jobs:
 
     - stage: Code Quality
       env: DB=none CODING_STANDARDS
-      php: nightly
+      php: 7.2
       script:
-        - ./vendor/bin/phpcs
+        - ./vendor/bin/phpcs lib
+        - ./vendor/bin/phpcs tests tools || true # disabled on CI until ported to new CS
 
   allow_failures:
     - php: nightly

diff --git a/composer.json b/composer.json
@@ -29,9 +29,8 @@
         "symfony/console": "~3.0|~4.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^1.0",
-        "phpunit/phpunit": "^6.5",
-        "squizlabs/php_codesniffer": "^3.2"
+        "doctrine/coding-standard": "~2.0.0",
+        "phpunit/phpunit": "^6.5"
     },
     "autoload": {
         "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" }