minor #32624 [Messenger] fix transport_name option not passing validation (Tobion)

Tobion · Tobion · commit 950306adaad8 · 2019-07-19T14:36:59.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] fix transport_name option not passing validation | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #32567 | License | MIT | Doc PR | the doctrine transport connection validates the options and complains about this option, so we remove it before. the other transports will probably add the validation as well: #32575 the purpose of the option is for custom transport factories anyway. Commits ------- 48408e3 [Messenger] fix transport_name option not passing validation
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpTransportFactory.php
@@ -24,6 +24,8 @@ class AmqpTransportFactory implements TransportFactoryInterface
 {
     public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
+        unset($options['transport_name']);
+
         return new AmqpTransport(Connection::fromDsn($dsn, $options), $serializer);
     }
 
diff --git a/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Doctrine/DoctrineTransportFactory.php
@@ -33,6 +33,7 @@ public function __construct(RegistryInterface $registry)
 
     public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
+        unset($options['transport_name']);
         $configuration = Connection::buildConfiguration($dsn, $options);
 
         try {
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransportFactory.php b/src/Symfony/Component/Messenger/Transport/RedisExt/RedisTransportFactory.php
@@ -25,6 +25,8 @@ class RedisTransportFactory implements TransportFactoryInterface
 {
     public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
+        unset($options['transport_name']);
+
         return new RedisTransport(Connection::fromDsn($dsn, $options), $serializer);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ class AmqpTransportFactory implements TransportFactoryInterface`
`24`	`24`	`{`
`25`	`25`	`public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface`
`26`	`26`	`{`
	`27`	`+ unset($options['transport_name']);`
	`28`	`+`
`27`	`29`	`return new AmqpTransport(Connection::fromDsn($dsn, $options), $serializer);`
`28`	`30`	`}`
`29`	`31`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function __construct(RegistryInterface $registry)`
`33`	`33`
`34`	`34`	`public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface`
`35`	`35`	`{`
	`36`	`+ unset($options['transport_name']);`
`36`	`37`	`$configuration = Connection::buildConfiguration($dsn, $options);`
`37`	`38`
`38`	`39`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ class RedisTransportFactory implements TransportFactoryInterface`
`25`	`25`	`{`
`26`	`26`	`public function createTransport(string $dsn, array $options, SerializerInterface $serializer): TransportInterface`
`27`	`27`	`{`
	`28`	`+ unset($options['transport_name']);`
	`29`	`+`
`28`	`30`	`return new RedisTransport(Connection::fromDsn($dsn, $options), $serializer);`
`29`	`31`	`}`
`30`	`32`