Merge pull request #157 from raphaelstolt/fix-global-env

Fix environment variables
jonathantorres · Oct 13, 2016 · 8660ee9 · 8660ee9
2 parents cd7e39c + 247f84a
commit 8660ee9
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 91 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,22 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 7.1
-      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:
@@ -24,7 +25,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

diff --git a/src/Defaults.php b/src/Defaults.php
@@ -25,6 +25,20 @@ class Defaults
      */
     public $phpVersions = ['5.4', '5.5', '5.6', '7.0', '7.1'];
 
+    /**
+     * Available php versions with a Xdebug extension.
+     *
+     * @var array
+     */
+    public $phpVersionsWithXdebugExtension = ['5.4', '5.5', '5.6', '7.0'];
+
+    /**
+     * Php versions without a semver scheme.
+     *
+     * @var array
+     */
+    public $nonSemverPhpVersions = ['hhvm', 'nightly'];
+
     const TEST_FRAMEWORK = 'phpunit';
     const LICENSE = 'MIT';
     const PROJECT_NAMESPACE = 'Vendor\Project';

diff --git a/src/Helpers/Travis.php b/src/Helpers/Travis.php
@@ -29,7 +29,7 @@ private function toMinorVersion($version)
     public function phpVersionsToTest($projectPhpVersion)
     {
         $supportedPhpVersions = (new Defaults)->phpVersions;
-        $versionsToTest = ['hhvm', 'nightly'];
+        $versionsToTest = (new Defaults)->nonSemverPhpVersions;
 
         $phpVersionsToTest = array_filter($supportedPhpVersions, function ($supportedPhpVersion) use ($projectPhpVersion) {
             return version_compare(
@@ -51,16 +51,23 @@ public function phpVersionsToTest($projectPhpVersion)
      */
     public function phpVersionsToRun($phpVersions)
     {
-        $versionsWithoutXdebugExtension = ['hhvm', 'nightly', '7.1'];
+        $versionsWithXdebugExtension = (new Defaults)->phpVersionsWithXdebugExtension;
         $runOn = '';
+        $nonSemverVersions = (new Defaults)->nonSemverPhpVersions;
 
         for ($i = 0; $i < count($phpVersions); $i++) {
+            $phpVersion = $phpVersions[$i];
+            if (!in_array($phpVersions[$i], $nonSemverVersions)) {
+                $phpVersion = $this->toMinorVersion($phpVersions[$i]);
+            }
+
             if (count($i) !== 0) {
                 $runOn .= '    ';
             }
             $runOn .= '- php: ' . $phpVersions[$i];
-            if (in_array($phpVersions[$i], $versionsWithoutXdebugExtension)) {
-                $runOn .= "\n      env: disable-xdebug=false";
+            if (in_array($phpVersion, $versionsWithXdebugExtension)) {
+                $runOn .= "\n      env:"
+                    . "\n      - DISABLE_XDEBUG=true";
             }
 
             if ($i !== (count($phpVersions) - 1)) {

diff --git a/src/stubs/travis.phpcs.stub b/src/stubs/travis.phpcs.stub
@@ -1,9 +1,5 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
 {phpVersions}
@@ -14,7 +10,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

diff --git a/src/stubs/travis.stub b/src/stubs/travis.stub
@@ -1,9 +1,5 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
 {phpVersions}
@@ -14,7 +10,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

diff --git a/tests/Helpers/TravisTest.php b/tests/Helpers/TravisTest.php
@@ -49,16 +49,23 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php54_proj
 
         $stringExpected = <<<CONTENT
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 5.4
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.5
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.5.9
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);
@@ -98,13 +105,19 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php55_proj
 
         $stringExpected = <<<CONTENT
     - php: hhvm
-      env: disable-xdebug=false
     - php: 5.5
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.5.9
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);
@@ -143,12 +156,16 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php559_pro
 
         $stringExpected = <<<CONTENT
     - php: hhvm
-      env: disable-xdebug=false
     - php: 5.5.9
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);
@@ -185,11 +202,13 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php56_proj
 
         $stringExpected = <<<CONTENT
     - php: hhvm
-      env: disable-xdebug=false
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);
@@ -242,10 +261,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
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);
@@ -278,9 +297,7 @@ public function it_should_generate_string_of_all_versions_to_run_on_a_php7_1_pro
 
         $stringExpected = <<<CONTENT
     - php: hhvm
-      env: disable-xdebug=false
     - php: 7.1
-      env: disable-xdebug=false
 CONTENT;
 
         $this->assertEquals($versionsToRun, $stringExpected);

diff --git a/tests/stubs/travis.php54.stub b/tests/stubs/travis.php54.stub
@@ -1,29 +1,30 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 5.4
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.5
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      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

diff --git a/tests/stubs/travis.php55.stub b/tests/stubs/travis.php55.stub
@@ -1,28 +1,27 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 5.5
+      env:
+      - DISABLE_XDEBUG=true
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      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

diff --git a/tests/stubs/travis.php56.stub b/tests/stubs/travis.php56.stub
@@ -1,27 +1,24 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 5.6
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      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

diff --git a/tests/stubs/travis.php7.stub b/tests/stubs/travis.php7.stub
@@ -1,26 +1,21 @@
 language: php
 
-env:
-  global:
-    - disable-xdebug=true
-
 matrix:
   include:
     - php: hhvm
-      env: disable-xdebug=false
     - php: nightly
-      env: disable-xdebug=false
     - php: 7.0
+      env:
+      - DISABLE_XDEBUG=true
     - php: 7.1
-      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