Merge branch '3.3' into 3.4

* 3.3:
  Fix travis php7.0
  Add support to environment variables APP_ENV/DEBUG in KernelTestCase
  [Routing] Cleanup apache fixtures

Author: nicolas-grekas

.travis.yml

@@ -27,7 +27,7 @@ matrix:
         - php: 5.6
         - php: 7.1
           env: deps=high
-        - php: 7.0.8
+        - php: 7.0
           env: deps=low
     fast_finish: true
 
@@ -128,11 +128,6 @@ before_install:
 
     - |
       # Install extra PHP extensions
-      if [[ ! $skip && $PHP = 7.0.* ]]; then
-          wget https://github.com/symfony/binary-utils/releases/download/v0.1/ldap-php70.tar.bz2
-          tar -xjf ldap-php70.tar.bz2
-          echo extension = $(pwd)/ldap.so >> $INI
-      fi
       if [[ ! $skip && $PHP = 5.* ]]; then
           ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
           tfold ext.apcu4 'echo yes | pecl install -f apcu-4.0.11'

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -188,10 +188,27 @@ protected static function createKernel(array $options = array())
             static::$class = static::getKernelClass();
         }
 
-        return new static::$class(
-            isset($options['environment']) ? $options['environment'] : 'test',
-            isset($options['debug']) ? $options['debug'] : true
-        );
+        if (isset($options['environment'])) {
+            $env = $options['environment'];
+        } elseif (isset($_SERVER['APP_ENV'])) {
+            $env = $_SERVER['APP_ENV'];
+        } elseif (isset($_ENV['APP_ENV'])) {
+            $env = $_ENV['APP_ENV'];
+        } else {
+            $env = 'test';
+        }
+
+        if (isset($options['debug'])) {
+            $debug = $options['debug'];
+        } elseif (isset($_SERVER['APP_DEBUG'])) {
+            $debug = $_SERVER['APP_DEBUG'];
+        } elseif (isset($_ENV['APP_DEBUG'])) {
+            $debug = $_ENV['APP_DEBUG'];
+        } else {
+            $debug = true;
+        }
+
+        return new static::$class($env, $debug);
     }
 
     /**