updated symfony components

Author: wachterjohannes

.travis.yml

@@ -3,29 +3,48 @@ language: php
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
+    - php: 5.6
       env:
         - STORAGE=doctrine
-    - php: 5.5
-      env:
-        - STORAGE=array
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
     - php: 5.6
       env:
         - STORAGE=doctrine
-        - CODE_COVERAGE=true
     - php: 5.6
       env:
         - STORAGE=array
     - php: 7.0
       env:
         - STORAGE=doctrine
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
+    - php: 7.0
+      env:
+        - STORAGE=doctrine
+    - php: 7.0
+      env:
+        - STORAGE=array
+    - php: 7.0
+      env:
+        - STORAGE=doctrine
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
     - php: 7.0
+      env:
+        - STORAGE=doctrine
+    - php: 7.1
       env:
         - STORAGE=array
+    - php: 7.1
+      env:
+        - STORAGE=doctrine
+        - COMPOSER_FLAGS="--prefer-lowest --prefer-dist --no-interaction"
+    - php: 7.1
+      env:
+        - STORAGE=doctrine
+        - CODE_COVERAGE=true
 
 install:
    - composer self-update
-   - composer update
+   - composer update $COMPOSER_FLAGS
    - composer info
 
 before_script:

composer.json

@@ -10,20 +10,20 @@
         }
     ],
     "require": {
-        "php": "~5.5 || ~7.0",
-        "php-task/php-task": "^1.2",
-        "symfony/http-kernel": "^2.6 || ^3.0",
-        "symfony/dependency-injection": "^2.6 || ^3.0",
-        "symfony/expression-language": "^2.6 || ^3.0",
-        "symfony/config": "^2.6 || ^3.0",
-        "symfony/console": "^2.6 || ^3.0",
-        "symfony/process": "^2.6 || ^3.0",
+        "php": "^5.6 || ^7.0",
+        "php-task/php-task": "^1.3",
+        "symfony/http-kernel": "^2.6 || ^3.4 || ^4.0",
+        "symfony/dependency-injection": "^2.6 || ^3.4 || ^4.0",
+        "symfony/expression-language": "^2.6 || ^3.4 || ^4.0",
+        "symfony/config": "^2.6 || ^3.4 || ^4.0",
+        "symfony/console": "^2.6 || ^3.4 || ^4.0",
+        "symfony/process": "^2.6 || ^3.4 || ^4.0",
         "doctrine/orm": "^2.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
-        "symfony/framework-bundle": "^2.6",
-        "symfony/finder": "^2.6",
+        "symfony/framework-bundle": "^2.6 || ^3.4 || ^4.0",
+        "symfony/finder": "^2.6 || ^3.4 || ^4.0",
         "doctrine/doctrine-bundle": "^1.5",
         "doctrine/data-fixtures": "^1.1"
     },

phpunit.xml.dist

@@ -4,10 +4,11 @@
          xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="vendor/autoload.php">
+         bootstrap="tests/bootstrap.php">
     <php>
         <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="tests/app" />
+        <server name="KERNEL_CLASS" value="TestKernel" />
     </php>
 
     <testsuites>

src/DependencyInjection/TaskExtension.php

@@ -89,7 +89,7 @@ private function loadDoctrineAdapter(array $config, ContainerBuilder $container)
      */
     private function loadLockingComponent(array $config, ContainerBuilder $container, LoaderInterface $loader)
     {
-        if (!$config['enabled']) {
+        if (!$config['enabled'] || 'null' === $config['storage']) {
             return $loader->load('locking/null.xml');
         }
 
@@ -135,7 +135,7 @@ private function getLockingStorageAliases(ContainerBuilder $container)
     {
         $taggedServices = $container->findTaggedServiceIds('task.lock.storage');
 
-        $result = [];
+        $result = ['null'];
         foreach ($taggedServices as $id => $tags) {
             foreach ($tags as $tag) {
                 $result[$tag['alias']] = $id;

tests/app/TestKernel.php

@@ -62,6 +62,7 @@ protected function buildContainer()
         $loader->load('services.xml');
 
         $container->setParameter('kernel.storage', $this->storage);
+        $container->setParameter('container.build_id', hash('crc32', 'Abc123423456789'));
 
         return $container;
     }
@@ -71,16 +72,32 @@ protected function buildContainer()
      */
     protected function initializeContainer()
     {
-        $fresh = false;
+        static $first = true;
 
-        $container = $this->buildContainer();
-        $container->compile();
+        if ('test' !== $this->getEnvironment()) {
+            parent::initializeContainer();
 
-        $this->container = $container;
-        $this->container->set('kernel', $this);
+            return;
+        }
+
+        $debug = $this->debug;
 
-        if (!$fresh && $this->container->has('cache_warmer')) {
-            $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
+        if (!$first) {
+            // disable debug mode on all but the first initialization
+            $this->debug = false;
         }
+
+        // will not work with --process-isolation
+        $first = false;
+
+        try {
+            parent::initializeContainer();
+        } catch (\Exception $e) {
+            $this->debug = $debug;
+
+            throw $e;
+        }
+
+        $this->debug = $debug;
     }
 }

tests/bootstrap.php

@@ -0,0 +1,16 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+
+$file = __DIR__ . '/../vendor/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies to run test suite.');
+}
+
+$loader = require $file;
+
+require __DIR__ . '/app/TestKernel.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;