Merge pull request #1836 from meyerbaptiste/speed_up_travis

Speed-up Travis

.travis.yml

@@ -17,12 +17,12 @@ matrix:
     - php: '7.0'
     - php: '7.1'
     - php: '7.2'
+    - php: '7.2'
+      env: coverage=1
     - php: '7.2'
       env: lint=1
     - php: '7.2'
       env: deps=low
-    - php: '7.2'
-      env: coverage=1
     - php: '7.2'
       env: SYMFONY_DEPRECATIONS_HELPER=0
     - php: '7.2'
@@ -75,9 +75,9 @@ install:
 
 script:
   - if [[ $coverage = 1 ]]; then
-      phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov;
+      APP_ENV=test_phpunit phpdbg -qrr vendor/bin/phpunit --coverage-php build/cov/coverage-phpunit.cov;
     elif [[ $lint != 1 ]]; then
-      vendor/bin/phpunit;
+      APP_ENV=test_phpunit vendor/bin/phpunit;
     fi
   - if [[ $coverage = 1 ]]; then
       for f in $(find features -name '*.feature' -not -path 'features/main/exposed_state.feature'); do

behat.yml.dist

@@ -31,7 +31,7 @@ default:
   extensions:
     'Behat\Symfony2Extension':
       kernel:
-        env: '%env(APP_ENV)%'
+        env: 'test'
         debug: 'true'
         path: 'tests/Fixtures/app/AppKernel.php'
         bootstrap: 'tests/Fixtures/app/bootstrap.php'

phpunit.xml.dist

@@ -12,6 +12,7 @@
         <ini name="memory_limit" value="-1" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
         <server name="KERNEL_CLASS" value="AppKernel" />
+        <server name="APP_ENV" value="test_phpunit" />
         <server name="LEGACY" value="0" />
     </php>
 

tests/Fixtures/app/AppKernel.php

@@ -38,6 +38,14 @@ class AppKernel extends Kernel
 {
     use MicroKernelTrait;
 
+    public function __construct(string $environment, bool $debug)
+    {
+        parent::__construct($environment, $debug);
+
+        // patch for behat/symfony2-extension not supporting %env(APP_ENV)%
+        $this->environment = $_SERVER['APP_ENV'] ?? $environment;
+    }
+
     public function registerBundles(): array
     {
         $bundles = [
@@ -69,15 +77,9 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
 
     protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
-        $environment = $this->getEnvironment();
         $c->setParameter('kernel.project_dir', __DIR__);
 
-        // patch for behat not supporting %env(APP_ENV)% in older versions
-        if (($appEnv = $_SERVER['APP_ENV'] ?? 'test') && $appEnv !== $environment) {
-            $environment = $appEnv;
-        }
-
-        $loader->load("{$this->getRootDir()}/config/config_{$environment}.yml");
+        $loader->load("{$this->getRootDir()}/config/config_{$this->getEnvironment()}.yml");
 
         $securityConfig = [
             'encoders' => [

tests/Fixtures/app/config/config_test_phpunit.yml

@@ -0,0 +1,2 @@
+imports:
+    - { resource: config_test.yml }