Skip to content

Commit

Permalink
Fix environment variables
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphaelstolt
raphaelstolt committed Oct 11, 2016
1 parent cd7e39c commit 5cbbcef
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 58 deletions.
14 changes: 9 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.0
env: DISABLE_XDEBUG=true
- php: 5.6
env: DISABLE_XDEBUG=true
- php: 5.5
env: DISABLE_XDEBUG=true
- php: 5.4
env: DISABLE_XDEBUG=true
fast_finish: true

cache:
Expand All @@ -24,7 +28,7 @@ cache:
- $HOME/.php-cs-fixer

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- composer self-update
Expand Down
2 changes: 1 addition & 1 deletion src/Helpers/Travis.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function phpVersionsToRun($phpVersions)
}
$runOn .= '- php: ' . $phpVersions[$i];
if (in_array($phpVersions[$i], $versionsWithoutXdebugExtension)) {
$runOn .= "\n env: disable-xdebug=false";
$runOn .= "\n env: DISABLE_XDEBUG=false";
}

if ($i !== (count($phpVersions) - 1)) {
Expand Down
4 changes: 2 additions & 2 deletions src/stubs/travis.phpcs.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
Expand All @@ -14,7 +14,7 @@ cache:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
4 changes: 2 additions & 2 deletions src/stubs/travis.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
Expand All @@ -14,7 +14,7 @@ cache:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
26 changes: 13 additions & 13 deletions tests/Helpers/TravisTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php54_proj

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.4
- php: 5.5
- php: 5.5.9
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down Expand Up @@ -98,13 +98,13 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php55_proj

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.5
- php: 5.5.9
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down Expand Up @@ -143,12 +143,12 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php559_pro

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.5.9
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down Expand Up @@ -185,11 +185,11 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php56_proj

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down Expand Up @@ -242,10 +242,10 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php7_0_pro

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down Expand Up @@ -278,9 +278,9 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php7_1_pro

$stringExpected = <<<CONTENT
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
CONTENT;

$this->assertEquals($versionsToRun, $stringExpected);
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.php54.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.4
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.php55.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.php56.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.php7.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.php71.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/travis.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down
10 changes: 5 additions & 5 deletions tests/stubs/with-phpcs/travis.stub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ language: php

env:
global:
- disable-xdebug=true
- DISABLE_XDEBUG=true

matrix:
include:
- php: hhvm
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: nightly
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
- php: 5.6
- php: 7.0
- php: 7.1
env: disable-xdebug=false
env: DISABLE_XDEBUG=false
fast_finish: true

cache:
directories:
- $HOME/.composer/cache

before_script:
- if [[ $disable-xdebug = true ]]; then
- if [[ $DISABLE_XDEBUG = true ]]; then
phpenv config-rm xdebug.ini;
fi
- travis_retry composer self-update
Expand Down

0 comments on commit 5cbbcef

Please sign in to comment.