try to fix sniffer installation

cakephp · Jan 5, 2017 · 86a3d44 · 86a3d44
1 parent 7716434
commit 86a3d44
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -87,8 +87,9 @@ before_install:
   - set +H
 
 before_script:
-  - if [[ $PHPCS != 3 ]]; then composer install --prefer-dist --no-interaction; fi
-  - if [[ $PHPCS = 3 ]]; then composer require --dev  squizlabs/php_codesniffer=3.0.x-dev@dev cakephp/cakephp-codesniffer=3.0.x-dev@dev; fi
+  - composer install --prefer-dist --no-interaction
+  - if [[ $PHPCS = 3 ]]; then composer remove --dev cakephp/cakephp-codesniffer; fi
+  - if [[ $PHPCS = 3 ]]; then composer require --dev squizlabs/php_codesniffer='3.0.*@dev' cakephp/cakephp-codesniffer='3.0.*@dev'; fi
 
 script:
   - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.0 ]]; then export CODECOVERAGE=1; vendor/bin/phpunit --coverage-clover=clover.xml; fi

diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
@@ -704,6 +704,7 @@ public function unwrap()
      * @return \Iterator
      * @deprecated
      */
+    // @codingStandardsIgnoreLine
     public function _unwrap()
     {
         return $this->unwrap();

diff --git a/src/Database/Dialect/SqlserverDialectTrait.php b/src/Database/Dialect/SqlserverDialectTrait.php
@@ -80,6 +80,7 @@ protected function _selectQueryTranslator($query)
      *
      * @return int
      */
+    // @codingStandardsIgnoreLine
     public function _version()
     {
         $this->connect();