Skip to content

Commit

Permalink
Improve travis (#2)
Browse files Browse the repository at this point in the history
* Improve travis

* Fix future php-cs-fixer config changes

* Skip php-cs-fixer env checks
  • Loading branch information
veewee authored Aug 31, 2018
1 parent d646ad2 commit fec9f2e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ return PhpCsFixer\Config::create()
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'backtick_to_shell_exec' => true,
'blank_line_before_return' => true,
'blank_line_before_statement' => true,
'class_keyword_remove' => false,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
Expand Down
44 changes: 30 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
language: php

php:
- 7.2
- nightly

env:
matrix:
-
- DEPENDENCIES=--prefer-lowest
global:
- DEFAULT_COMPOSER_FLAGS="--optimize-autoloader --no-interaction --no-progress"
- COMPOSER_FLAGS=""

before_install:
- alias composer=composer\ --no-interaction && composer selfupdate

cache:
directories:
Expand All @@ -18,11 +17,28 @@ matrix:
allow_failures:
- php: nightly

before_install:
- alias composer=composer\ --no-interaction && composer selfupdate

install:
- travis_retry composer update --no-progress --profile --no-scripts --no-suggest $DEPENDENCIES
jobs:
include:
- &STANDARD_TEST_JOB
stage: Test
php: 7.2
install:
- travis_retry composer update $DEFAULT_COMPOSER_FLAGS $COMPOSER_FLAGS
- composer info -D | sort
script:
- vendor/bin/grumphp run
-
<<: *STANDARD_TEST_JOB
stage: Test
php: 7.2
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
-
<<: *STANDARD_TEST_JOB
stage: Test
php: nightly
env: COMPOSER_FLAGS="--ignore-platform-reqs" PHP_CS_FIXER_IGNORE_ENV=1 PHP_CS_FIXER_FUTURE_MODE=1
script:
- vendor/bin/grumphp run

script:
- vendor/bin/grumphp run
allow_failures:
- php: nightly
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Since handling the exceptions is up to the framework, here is a list of known fr
## Installation

```sh
composer require --dev phpro/api-problem
composer require phpro/api-problem
```

## Usage
Expand Down

0 comments on commit fec9f2e

Please sign in to comment.