Permalink
Browse files

try to fix sniffer installation

  • Loading branch information...
antograssiot committed Jan 5, 2017
1 parent 7716434 commit 86a3d4443e4ef6ca233a13e2cd0bae65d88ac7a5
Showing with 5 additions and 2 deletions.
  1. +3 −2 .travis.yml
  2. +1 −0 src/Collection/CollectionTrait.php
  3. +1 −0 src/Database/Dialect/SqlserverDialectTrait.php
View
@@ -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
@@ -704,6 +704,7 @@ public function unwrap()
* @return \Iterator
* @deprecated
*/
// @codingStandardsIgnoreLine
public function _unwrap()
{
return $this->unwrap();
@@ -80,6 +80,7 @@ protected function _selectQueryTranslator($query)
*
* @return int
*/
// @codingStandardsIgnoreLine
public function _version()
{
$this->connect();

0 comments on commit 86a3d44

Please sign in to comment.