10000 Merge branch '5.2' into 5.3 · symfony/symfony@95b3d0a · GitHub
[go: up one dir, main page]
Skip to content

Commit 95b3d0a

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.2' into 5.3
* 5.2: [Messenger] Fix opcache preload with alias classes Fix opcache preload with alias classes
2 parents 0eda144 + 475ddaf commit 95b3d0a

21 files changed

+83
-21
lines changed

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/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+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,4 +445,7 @@ private function updateSchema(): void
445445
}
446446
}
447447
}
448-
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\Doctrine\Connection::class);
448+
449+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\Connection::class, false)) {
450+
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\Doctrine\Connection::class);
451+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceivedStamp.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ public function getId(): string
3030
return $this->id;
3131
}
3232
}
33-
class_alias(DoctrineReceivedStamp::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceivedStamp::class);
33+
34+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceivedStamp::class, false)) {
35+
class_alias(DoctrineReceivedStamp::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceivedStamp::class);
36+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,4 +171,7 @@ private function createEnvelopeFromData(array $data): Envelope
171171
);
172172
}
173173
}
174-
class_alias(DoctrineReceiver::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceiver::class);
174+
175+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceiver::class, false)) {
176+
class_alias(DoctrineReceiver::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineReceiver::class);
177+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,7 @@ public function send(Envelope $envelope): Envelope
5555
return $envelope->with(new TransportMessageIdStamp($id));
5656
}
5757
}
58-
class_alias(DoctrineSender::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineSender::class);
58+
59+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\DoctrineSender::class, false)) {
60+
class_alias(DoctrineSender::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineSender::class);
61+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,7 @@ private function getSender(): DoctrineSender
129129
return $this->sender = new DoctrineSender($this->connection, $this->serializer);
130130
}
131131
}
132-
class_alias(DoctrineTransport::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransport::class);
132+
133+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransport::class, false)) {
134+
class_alias(DoctrineTransport::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransport::class);
135+
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,7 @@ public function supports(string $dsn, array $options): bool
6262
return 0 === strpos($dsn, 'doctrine://');
6363
}
6464
}
65-
class_alias(DoctrineTransportFactory::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory::class);
65+
66+
if (!class_exists(\Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory::class, false)) {
67+
class_alias(DoctrineTransportFactory::class, \Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory::class);
68+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,4 +548,7 @@ public function cleanup(): void
548548
}
549549
}
550550
}
551-
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\RedisExt\Connection::class);
551+
552+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\Connection::class, false)) {
553+
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\RedisExt\Connection::class);
554+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceivedStamp.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,7 @@ public function getId(): string
3030
return $this->id;
3131
}
3232
}
33-
class_alias(RedisReceivedStamp::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisReceivedStamp::class);
33+
34+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisReceivedStamp::class, false)) {
35+
class_alias(RedisReceivedStamp::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisReceivedStamp::class);
36+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,7 @@ private function findRedisReceivedStamp(Envelope $envelope): RedisReceivedStamp
8686
return $redisReceivedStamp;
8787
}
8888
}
89-
class_alias(RedisReceiver::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisReceiver::class);
89+
90+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisReceiver::class, false)) {
91+
class_alias(RedisReceiver::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisReceiver::class);
92+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisSender.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,7 @@ public function send(Envelope $envelope): Envelope
4747
return $envelope;
4848
}
4949
}
50-
class_alias(RedisSender::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisSender::class);
50+
51+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisSender::class, false)) {
52+
class_alias(RedisSender::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisSender::class);
53+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@ private function getSender(): RedisSender
8484
return $this->sender = new RedisSender($this->connection, $this->serializer);
8585
}
8686
}
87-
class_alias(RedisTransport::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisTransport::class);
87+
88+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransport::class, false)) {
89+
class_alias(RedisTransport::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisTransport::class);
90+
}

‎src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransportFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ public function supports(string $dsn, array $options): bool
3333
return 0 === strpos($dsn, 'redis://');
3434
}
3535
}
36-
class_alias(RedisTransportFactory::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class);
36+
37+
if (!class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class, false)) {
38+
class_alias(RedisTransportFactory::class, \Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class);
39+
}

‎src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,6 @@ public function getDecisionLog(): array
107107
}
108108
}
109109

110-
class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);
110+
if (!class_exists(DebugAccessDecisionManager::class, false)) {
111+
class_alias(TraceableAccessDecisionManager::class, DebugAccessDecisionManager::class);
112+
}

0 commit comments

Comments
 (0)
0