minor #30799 [Messenger] Fix the Doctrine transport to use the new interface (sroze)

sroze · sroze · commit a9459c0980d8 · 2019-03-31T18:12:31.000+01:00
This PR was merged into the 4.3-dev branch. Discussion ---------- [Messenger] Fix the Doctrine transport to use the new interface | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29007 | License | MIT | Doc PR | ø Commits ------- 75e3355 Fix the Doctrine transport to use the new interface
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineTransportFactoryTest.php
@@ -16,15 +16,14 @@
 use Symfony\Component\Messenger\Transport\Doctrine\Connection;
 use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransport;
 use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory;
+use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 class DoctrineTransportFactoryTest extends TestCase
 {
     public function testSupports()
     {
         $factory = new DoctrineTransportFactory(
-            $this->getMockBuilder(RegistryInterface::class)->getMock(),
-            null,
-            false
+            $this->getMockBuilder(RegistryInterface::class)->getMock()
         );
 
         $this->assertTrue($factory->supports('doctrine://default', []));
@@ -41,14 +40,12 @@ public function testCreateTransport()
             ->method('getConnection')
             ->willReturn($connection);
 
-        $factory = new DoctrineTransportFactory(
-            $registry,
-            null
-        );
+        $factory = new DoctrineTransportFactory($registry);
+        $serializer = $this->createMock(SerializerInterface::class);
 
         $this->assertEquals(
-            new DoctrineTransport(new Connection(Connection::buildConfiguration('doctrine://default'), $connection), null),
-            $factory->createTransport('doctrine://default', [])
+            new DoctrineTransport(new Connection(Connection::buildConfiguration('doctrine://default'), $connection), $serializer),
+            $factory->createTransport('doctrine://default', [], $serializer)
         );
     }
 
@@ -65,11 +62,7 @@ public function testCreateTransportMustThrowAnExceptionIfManagerIsNotFound()
                 throw new \InvalidArgumentException();
             }));
 
-        $factory = new DoctrineTransportFactory(
-            $registry,
-            null
-        );
-
-        $factory->createTransport('doctrine://default', []);
+        $factory = new DoctrineTransportFactory($registry);
+        $factory->createTransport('doctrine://default', [], $this->createMock(SerializerInterface::class));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransport.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Messenger\Transport\Doctrine;
 
 use Symfony\Component\Messenger\Envelope;
-use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\SetupableTransportInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -29,10 +28,10 @@ class DoctrineTransport implements TransportInterface, SetupableTransportInterfa
     private $receiver;
     private $sender;
 
-    public function __construct(Connection $connection, SerializerInterface $serializer = null)
+    public function __construct(Connection $connection, SerializerInterface $serializer)
     {
         $this->connection = $connection;
-        $this->serializer = $serializer ?? new PhpSerializer();
+        $this->serializer = $serializer;
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
@@ -13,7 +13,6 @@
 
 use Symfony\Bridge\Doctrine\RegistryInterface;
 use Symfony\Component\Messenger\Exception\TransportException;
-use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -26,15 +25,13 @@
 class DoctrineTransportFactory implements TransportFactoryInterface
 {
     private $registry;
-    private $serializer;
 
-    public function __construct(RegistryInterface $registry, SerializerInterface $serializer = null)
+    public function __construct(RegistryInterface $registry)
     {
         $this->registry = $registry;
-        $this->serializer = $serializer ?? new PhpSerializer();
     }
 
-    public function createTransport(string $dsn, array $options): TransportInterface
+    public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         $configuration = Connection::buildConfiguration($dsn, $options);
 
@@ -46,7 +43,7 @@ public function createTransport(string $dsn, array $options): TransportInterface
 
         $connection = new Connection($configuration, $driverConnection);
 
-        return new DoctrineTransport($connection, $this->serializer);
+        return new DoctrineTransport($connection, $serializer);
     }
 
     public function supports(string $dsn, array $options): bool

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`
`14`	`14`	`use Symfony\Bridge\Doctrine\RegistryInterface;`
`15`	`15`	`use Symfony\Component\Messenger\Exception\TransportException;`
`16`		`-use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer;`
`17`	`16`	`use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;`
`18`	`17`	`use Symfony\Component\Messenger\Transport\TransportFactoryInterface;`
`19`	`18`	`use Symfony\Component\Messenger\Transport\TransportInterface;`
`@@ -26,15 +25,13 @@`
`26`	`25`	`class DoctrineTransportFactory implements TransportFactoryInterface`
`27`	`26`	`{`
`28`	`27`	`private $registry;`
`29`		`- private $serializer;`
`30`	`28`
`31`		`- public function __construct(RegistryInterface $registry, SerializerInterface $serializer = null)`
	`29`	`+ public function __construct(RegistryInterface $registry)`
`32`	`30`	`{`
`33`	`31`	`$this->registry = $registry;`
`34`		`- $this->serializer = $serializer ?? new PhpSerializer();`
`35`	`32`	`}`
`36`	`33`
`37`		`- public function createTransport(string $dsn, array $options): TransportInterface`
	`34`	`+ public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface`
`38`	`35`	`{`
`39`	`36`	`$configuration = Connection::buildConfiguration($dsn, $options);`
`40`	`37`
`@@ -46,7 +43,7 @@ public function createTransport(string $dsn, array $options): TransportInterface`
`46`	`43`
`47`	`44`	`$connection = new Connection($configuration, $driverConnection);`
`48`	`45`
`49`		`- return new DoctrineTransport($connection, $this->serializer);`
	`46`	`+ return new DoctrineTransport($connection, $serializer);`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`public function supports(string $dsn, array $options): bool`