Update for CI

doctrine · May 14, 2018 · 1fb8719 · 1fb8719
1 parent b04cc9e
commit 1fb8719
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,12 @@ jobs:
         - composer config minimum-stability RC
         - travis_retry composer update -n --prefer-dist
 
+    - php: 7.1
+      env: stability=beta SYMFONY_DEPRECATIONS_HELPER=weak SYMFONY_VERSION="~4.1-beta2"
+      install:
+        - composer config minimum-stability beta
+        - travis_retry composer update -n --prefer-dist
+
     - php: 7.2
       env: stability=alpha
       install:

diff --git a/Tests/DependencyInjection/Compiler/MessengerPassTest.php b/Tests/DependencyInjection/Compiler/MessengerPassTest.php
@@ -8,9 +8,17 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Messenger\MessageBus;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 class MessengerPassTest extends TestCase
 {
+    protected function setUp()
+    {
+        if (!interface_exists(MessageBusInterface::class)) {
+            $this->markTestSkipped('Symfony Messenger component is not installed');
+        }
+    }
+
     public function testRemovesDefinitionsWhenMessengerComponentIsDisabled()
     {
         $pass = new MessengerPass();

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 class DoctrineExtensionTest extends TestCase
 {
@@ -678,6 +679,10 @@ public function testAnnotationsBundleMappingDetectionWithVendorNamespace()
 
     public function testMessengerIntegration()
     {
+        if (!interface_exists(MessageBusInterface::class)) {
+            $this->markTestSkipped('Symfony Messenger component is not installed');
+        }
+
         $container = $this->getContainer();
         $extension = new DoctrineExtension();
 

diff --git a/composer.json b/composer.json
@@ -42,8 +42,7 @@
         "twig/twig": "~1.26|~2.0",
         "satooshi/php-coveralls": "^1.0",
         "phpunit/phpunit": "^4.8.36|^5.7|^6.4",
-        "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0",
-        "symfony/messenger": "~4.1-beta2"
+        "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0"
     },
     "conflict": {
         "symfony/http-foundation": "<2.6"
@@ -62,6 +61,5 @@
         "branch-alias": {
             "dev-master": "1.9.x-dev"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }