Skip to content

Commit 233f876

Browse files
Merge branch '6.0' into 6.1
* 6.0: (23 commits) Fix composer on appveyor fix bootstrap_3_layout ChoiceType's expanded label_html [Messenger][Security/Core] Remove legacy class aliases [PropertyAccess] Fix typo in PropertyAccessor::readProperty() DocBlock [PropertyInfo] PhpStanExtractor namespace missmatch issue [VarExporter] Fix exporting objects with readonly properties [ExpressionLanguage] Fix matches when the regexp is not valid [Messenger] Add mysql indexes back and work around deadlocks using soft-delete Add BC layer to handle old objects already present in cache [RateLimiter] Always store SlidingWindows with an expiration set [Validator] Fix File constraint invalid max size exception message [Console] Fix exit status on uncaught exception with negative code [Validator] fix #43345 @Assert\DivisibleBy [HttpClient] fix 303 after PUT and sending chunked requests [HttpClient] always send Content-Type when a body is passed [HttpClient] always send Content-Length when a body is passed [HttpClient] fix sending Content-Length/Type for POST Fix merge [HttpClient] fix sending PUT requests with curl Fix locales format in CrowdinProvider ...
2 parents 3a426c8 + 86b2235 commit 233f876

File tree

8 files changed

+0
-32
lines changed

8 files changed

+0
-32
lines changed

Transport/AmqpFactory.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,3 @@ public function createExchange(\AMQPChannel $channel): \AMQPExchange
3333
return new \AMQPExchange($channel);
3434
}
3535
}
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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,3 @@ public function getQueueName(): string
3737
return $this->queueName;
3838
}
3939
}
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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,3 @@ private function findAmqpStamp(Envelope $envelope): AmqpReceivedStamp
144144
return $amqpReceivedStamp;
145145
}
146146
}
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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,3 @@ public function send(Envelope $envelope): Envelope
8080
return $envelope;
8181
}
8282
}
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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,3 @@ public static function createWithAttributes(array $attributes, self $previousSta
8888
);
8989
}
9090
}
91-
92-
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp::class, false)) {
93-
class_alias(AmqpStamp::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpStamp::class);
94-
}

Transport/AmqpTransport.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,3 @@ private function getSender(): AmqpSender
101101
return $this->sender ??= new AmqpSender($this->connection, $this->serializer);
102102
}
103103
}
104-
105-
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport::class, false)) {
106-
class_alias(AmqpTransport::class, \Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport::class);
107-
}

Transport/AmqpTransportFactory.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,3 @@ public function supports(string $dsn, array $options): bool
3232
return str_starts_with($dsn, 'amqp://') || str_starts_with($dsn, 'amqps://');
3333
}
3434
}
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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,3 @@ private function getRoutingKeyForMessage(?AmqpStamp $amqpStamp): ?string
560560
return $amqpStamp?->getRoutingKey() ?? $this->getDefaultPublishRoutingKey();
561561
}
562562
}
563-
564-
if (!class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\Connection::class, false)) {
565-
class_alias(Connection::class, \Symfony\Component\Messenger\Transport\AmqpExt\Connection::class);
566-
}

0 commit comments

Comments
 (0)