Merge branch '2.1.x'

doctrine · Oct 25, 2020 · 9cea714 · 9cea714
2 parents 6396475 + 5ec7f35
commit 9cea714
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,15 +52,15 @@ jobs:
         - composer require --dev symfony/messenger --no-update
         - travis_retry composer update -n --prefer-dist
 
-    # Test against latest Symfony 5.0 dev
-    - php: 7.3
-      env: SYMFONY_REQUIRE="5.0.*"
+    # Test against latest Symfony 5.2 dev
+    - php: 7.4
+      env: SYMFONY_REQUIRE="5.2.*"
       install:
         - composer require --dev symfony/messenger --no-update
         - travis_retry composer update -n --prefer-dist
 
     # Test dev versions
-    - php: 7.3
+    - php: 7.4
       if: type = cron
       env: DEV
       install:

diff --git a/Tests/CacheSchemaSubscriberTest.php b/Tests/CacheSchemaSubscriberTest.php
@@ -30,6 +30,7 @@ public function testSchemaSubscriberWiring() : void
             'kernel.bundles' => [],
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
+            'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],

diff --git a/Tests/ServiceRepositoryTest.php b/Tests/ServiceRepositoryTest.php
@@ -43,6 +43,7 @@ public function testRepositoryServiceWiring() : void
             'kernel.bundles' => ['RepositoryServiceBundle' => RepositoryServiceBundle::class],
             'kernel.cache_dir' => sys_get_temp_dir(),
             'kernel.environment' => 'test',
+            'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%',
             'kernel.root_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.project_dir' => __DIR__ . '/../../../../', // src dir
             'kernel.bundles_metadata' => [],

diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "symfony/validator": "^3.4.30|^4.3.3|^5.0",
         "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0",
         "symfony/yaml": "^3.4.30|^4.3.3|^5.0",
-        "twig/twig": "^1.34|^2.12"
+        "twig/twig": "^1.34|^2.12|^3.0"
     },
     "config": {
         "sort-packages": true