Skip to content

Commit 4f89ce3

Browse files
Merge branch '5.2' into 5.3
* 5.2: [Messenger] Fix opcache preload with alias classes Fix opcache preload with alias classes
2 parents d8a2b1f + 7c06073 commit 4f89ce3

File tree

8 files changed

+32
-8
lines changed

8 files changed

+32
-8
lines changed

Transport/AmqpFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ public function createExchange(\AMQPChannel $channel): \AMQPExchange
3333
return new \AMQPExchange($channel);
3434
}
3535
}
36-
class_alias(AmqpFactory::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpFactory::class);
36+
37+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpFactory::class, false)) {
38+
class_alias(AmqpFactory::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpFactory::class);
39+
}

Transport/AmqpReceivedStamp.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,7 @@ public function getQueueName(): string
3737
return $this->queueName;
3838
}
3939
}
40-
class_alias(AmqpReceivedStamp::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp::class);
40+
41+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp::class, false)) {
42+
class_alias(AmqpReceivedStamp::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceivedStamp::class);
43+
}

Transport/AmqpReceiver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,7 @@ private function findAmqpStamp(Envelope $envelope): AmqpReceivedStamp
144144
return $amqpReceivedStamp;
145145
}
146146
}
147-
class_alias(AmqpReceiver::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver::class);
147+
148+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver::class, false)) {
149+
class_alias(AmqpReceiver::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver::class);
150+
}

Transport/AmqpSender.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,7 @@ public function send(Envelope $envelope): Envelope
8080
return $envelope;
8181
}
8282
}
83-
class_alias(AmqpSender::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender::class);
83+
84+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender::class, false)) {
85+
class_alias(AmqpSender::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender::class);
86+
}

Transport/AmqpStamp.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,7 @@ public static function createWithAttributes(array $attributes, self $previousSta
8787
);
8888
}
8989
}
90-
class_alias(AmqpStamp::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp::class);
90+
91+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp::class, false)) {
92+
class_alias(AmqpStamp::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp::class);
93+
}

Transport/AmqpTransport.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,7 @@ private function getSender(): AmqpSender
9292
return $this->sender = new AmqpSender($this->connection, $this->serializer);
9393
}
9494
}
95-
class_alias(AmqpTransport::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport::class);
95+
96+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport::class, false)) {
97+
class_alias(AmqpTransport::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport::class);
98+
}

Transport/AmqpTransportFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ public function supports(string $dsn, array $options): bool
3232
return 0 === strpos($dsn, 'amqp://') || 0 === strpos($dsn, 'amqps://');
3333
}
3434
}
35-
class_alias(AmqpTransportFactory::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class);
35+
36+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class, false)) {
37+
class_alias(AmqpTransportFactory::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class);
38+
}

Transport/Connection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,4 +577,7 @@ private function getRoutingKeyForMessage(?AmqpStamp $amqpStamp): ?string
577577
return (null !== $amqpStamp ? $amqpStamp->getRoutingKey() : null) ?? $this->getDefaultPublishRoutingKey();
578578
}
579579
}
580-
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\AmqpExt\Connection::class);
580+
581+
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\Connection::class, false)) {
582+
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\AmqpExt\Connection::class);
583+
}

0 commit comments

Comments
 (0)