Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests(phpcs): Update PHPCS to 3.4.1 and fix phpunit tests #22

Merged
merged 7 commits into from
Mar 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# For PHP 5.5 and lower testing we need to stick to Ubuntu 14.04.
dist: trusty
language: php
sudo: false

# Cache composer vendor directories to speed up the composer install step.
cache:
directories:
- $HOME/.composer/cache
- vendor

matrix:
fast_finish: true
include:
Expand All @@ -11,24 +18,15 @@ matrix:
- php: 7.0
- php: 7.1
- php: 7.2
- php: nightly
- php: hhvm

allow_failures:
- php: hhvm
- php: nightly
- php: 7.3

before_install:
# Speed up build time by disabling Xdebug when its not needed.
- phpenv config-rm xdebug.ini || echo 'No xdebug config.'
# Circumvent a bug in the travis HHVM image - ships with incompatible PHPUnit.
- if [[ $TRAVIS_PHP_VERSION == hhv* ]]; then composer self-update; fi
- if [[ $TRAVIS_PHP_VERSION == hhv* ]]; then composer require phpunit/phpunit:~4.0; fi
- if [[ $TRAVIS_PHP_VERSION == hhv* ]]; then composer install; fi

before_script:
# We don't have a composer.lock file because we always want to test with
# latest dependencies.
# Running composer install without a lock file will also update cached
# dependencies in vendor.
- composer install

script:
Expand Down
2 changes: 1 addition & 1 deletion coder_sniffer/Drupal/Test/bad/BadUnitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function getErrorList($testFile = NULL)
3 => 2,
4 => 1,
5 => 1,
6 => 2,
6 => 1,
7 => 1,
8 => 1,
9 => 1,
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": ">=5.4.0",
"ext-mbstring": "*",
"squizlabs/php_codesniffer": "^3.0.1",
"squizlabs/php_codesniffer": "^3.4.1",
"symfony/yaml": ">=2.0.0"
},
"autoload": {
Expand Down