Support Symfony 5 (#80)

* Add PHP 7.4 to test matrix
* Tighten all dependencies
* Apply deprecation fixes

Author: ruudk

.travis.yml

@@ -12,16 +12,23 @@ matrix:
     - php: 7.3
     - php: 7.3
       env: COMPOSER_FLAGS="--prefer-lowest"
+    - php: 7.4
+    - php: 7.4
+      env: COMPOSER_FLAGS="--prefer-lowest"
 
     # Test Symfony versions
-    - php: 7.3
-      env: SYMFONY_VERSION=3.4.*
     - php: 7.3
       env: SYMFONY_VERSION=4.4.*
     - php: 7.3
+      env: SYMFONY_VERSION=5.0.*
+    - php: 7.3
+      env: SYMFONY_VERSION=4.4.* REMOVE_PROXY_BRIDGE="yes" EXTRA_PHPUNIT_PARAMS="--group SymfonyBridgeProxyManagerDependency"
+    - php: 7.4
+      env: SYMFONY_VERSION=4.4.*
+    - php: 7.4
+      env: SYMFONY_VERSION=5.0.*
+    - php: 7.4
       env: SYMFONY_VERSION=4.4.* REMOVE_PROXY_BRIDGE="yes" EXTRA_PHPUNIT_PARAMS="--group SymfonyBridgeProxyManagerDependency"
-  allow_failures:
-    - env: COMPOSER_FLAGS="--prefer-lowest"
 
 env:
   global:

composer.json

@@ -27,21 +27,24 @@
     ],
     "require": {
         "php": "^7.3",
-        "simple-bus/message-bus": "~3.0",
-        "symfony/config": "~3.3 || ~4.0",
-        "symfony/dependency-injection": "~3.3 || ~4.0",
-        "symfony/http-kernel": "~3.3 || ~4.0",
-        "symfony/yaml": "~3.3 || ~4.0"
+        "simple-bus/message-bus": "^3.0",
+        "symfony/config": "^4.4 || ^5.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0",
+        "symfony/http-kernel": "^4.4 || ^5.0",
+        "symfony/yaml": "^4.4 || ^5.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "~1.0",
-        "doctrine/orm": "~2.5",
-        "phpunit/phpunit": "^5.7 || ^6.0",
-        "simple-bus/doctrine-orm-bridge": "~5.0",
-        "symfony/framework-bundle": "~3.3 || ~4.0",
-        "symfony/monolog-bridge": "~3.3 || ~4.0",
-        "symfony/monolog-bundle": "~2.3 || ~3.0",
-        "symfony/proxy-manager-bridge": "~3.3 || ~4.0"
+        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/orm": "^2.7",
+        "phpunit/phpunit": "^8.5",
+        "simple-bus/doctrine-orm-bridge": "^5.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0",
+        "symfony/monolog-bridge": "^4.4 || ^5.0",
+        "symfony/monolog-bundle": "^3.4",
+        "symfony/proxy-manager-bridge": "^4.4 || ^5.0"
+    },
+    "conflict": {
+        "zendframework/zend-code": "<3.3.1"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "For integration with Doctrine ORM",

tests/Functional/NestedCommandExecutionOrderConfigurationTest.php

@@ -75,7 +75,7 @@ public function disabling_finishes_command_before_handling_next_middleware_keeps
     }
 
     /** {@inheritdoc} */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 

tests/Functional/SmokeTest.php

@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\SchemaTool;
+use LogicException;
 use SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AutoCommand1;
 use SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AutoCommand2;
 use SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Auto\AutoEvent1;
@@ -23,7 +24,7 @@ protected static function getKernelClass()
         return TestKernel::class;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
@@ -54,12 +55,12 @@ public function it_handles_a_command_then_dispatches_events_for_all_modified_ent
 
         // it has logged some things
         $loggedMessages = file_get_contents($container->getParameter('log_file'));
-        $this->assertContains('command_bus.DEBUG: Started handling a message', $loggedMessages);
-        $this->assertContains('command_bus.DEBUG: Finished handling a message', $loggedMessages);
-        $this->assertContains('event_bus.DEBUG: Started handling a message', $loggedMessages);
-        $this->assertContains('event_bus.DEBUG: Finished handling a message', $loggedMessages);
-        $this->assertContains('event_bus.DEBUG: Started notifying a subscriber', $loggedMessages);
-        $this->assertContains('event_bus.DEBUG: Finished notifying a subscriber', $loggedMessages);
+        $this->assertStringContainsString('command_bus.DEBUG: Started handling a message', $loggedMessages);
+        $this->assertStringContainsString('command_bus.DEBUG: Finished handling a message', $loggedMessages);
+        $this->assertStringContainsString('event_bus.DEBUG: Started handling a message', $loggedMessages);
+        $this->assertStringContainsString('event_bus.DEBUG: Finished handling a message', $loggedMessages);
+        $this->assertStringContainsString('event_bus.DEBUG: Started notifying a subscriber', $loggedMessages);
+        $this->assertStringContainsString('event_bus.DEBUG: Finished notifying a subscriber', $loggedMessages);
     }
 
     /**
@@ -136,14 +137,13 @@ public function it_can_auto_register_command_handlers_using_public_method()
 
     /**
      * @test
-     * 
      * @group SymfonyBridgeProxyManagerDependency
-     *
-     * @expectedException        \LogicException
-     * @expectedExceptionMessage In order to use bundle "DoctrineOrmBridgeBundle" you need to require "symfony/proxy-manager-bridge" package.
      */
     public function fails_because_of_mising_dependency()
     {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('In order to use bundle "DoctrineOrmBridgeBundle" you need to require "symfony/proxy-manager-bridge" package.');
+
         self::bootKernel(['environment' => 'config2']);
     }
 

tests/Functional/SmokeTest/TestKernel.php

@@ -6,6 +6,7 @@
 use SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle;
 use SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle;
 use SimpleBus\SymfonyBridge\SimpleBusEventBusBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\MonologBundle\MonologBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
@@ -24,6 +25,7 @@ public function __construct($environment, $debug)
     public function registerBundles()
     {
         return array(
+            new FrameworkBundle(),
             new DoctrineBundle(),
             new SimpleBusCommandBusBundle(),
             new SimpleBusEventBusBundle(),
@@ -47,6 +49,11 @@ public function getLogDir()
         return $this->tempDir . '/logs';
     }
 
+    public function getProjectDir()
+    {
+        return __DIR__;
+    }
+
     protected function getContainerClass()
     {
         return parent::getContainerClass() . sha1(__NAMESPACE__);

tests/Functional/SmokeTest/config.yml

@@ -2,6 +2,9 @@ services:
     annotation_reader:
         class: Doctrine\Common\Annotations\AnnotationReader
 
+framework:
+    secret: 'secret'
+
 doctrine:
     dbal:
         driver: pdo_sqlite
@@ -14,7 +17,7 @@ doctrine:
                 mappings:
                     test:
                         type: annotation
-                        dir: "%kernel.root_dir%/Entity/"
+                        dir: "%kernel.project_dir%/Entity/"
                         prefix: SimpleBus\SymfonyBridge\Tests\Functional\SmokeTest\Entity
                         alias: Test
                         is_bundle: false

tests/SymfonyBundle/DependencyInjection/Compiler/ConfigureMiddlewaresTest.php

@@ -27,7 +27,7 @@ class ConfigureMiddlewaresTest extends TestCase
      */
     private $mainBusDefinition;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
         $this->mainBusDefinition = new Definition('stdClass');