Skip to content

Commit b851d21

Browse files
Merge branch '6.4' into 7.3
* 6.4: Remove calls to no-op functions, deprecated in PHP 8.5 Remove deprecated calls to deprecated methods of SplObjectStorage [Messenger] Show package installation hint also for amqps
2 parents 84190bf + 3c1cf3f commit b851d21

File tree

16 files changed

+27
-32
lines changed

16 files changed

+27
-32
lines changed

src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private function sendToElasticsearch(array $records): void
133133
],
134134
]);
135135

136-
$this->responses->attach($response);
136+
$this->responses[$response] = null;
137137

138138
$this->wait(false);
139139
}
@@ -164,10 +164,10 @@ private function wait(bool $blocking): void
164164
continue;
165165
}
166166
if ($chunk->isLast()) {
167-
$this->responses->detach($response);
167+
unset($this->responses[$response]);
168168
}
169169
} catch (ExceptionInterface $e) {
170-
$this->responses->detach($response);
170+
unset($this->responses[$response]);
171171
error_log(\sprintf("Could not push logs to Elasticsearch:\n%s", (string) $e));
172172
}
173173
}

src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected function setUp(): void
3636
];
3737

3838
$transitionsMetadata = new \SplObjectStorage();
39-
$transitionsMetadata->attach($this->t1, ['title' => 't1 title']);
39+
$transitionsMetadata[$this->t1] = ['title' => 't1 title'];
4040
$metadataStore = new InMemoryMetadataStore(
4141
['title' => 'workflow title'],
4242
['orderer' => ['title' => 'ordered title']],

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,7 @@ private function addServiceConfigurator(Definition $definition, string $variable
799799

800800
if (\is_array($callable)) {
801801
if ($callable[0] instanceof Reference
802-
|| ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
802+
|| ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
803803
) {
804804
return \sprintf(" %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
805805
}
@@ -1187,15 +1187,15 @@ private function addNewInstance(Definition $definition, string $return = '', ?st
11871187

11881188
if (['...'] === $arguments && ('Closure' !== ($class = $definition->getClass() ?: 'Closure') || $definition->isLazy() && (
11891189
$callable[0] instanceof Reference
1190-
|| ($callable[0] instanceof Definition && !$this->definitionVariables->contains($callable[0]))
1190+
|| ($callable[0] instanceof Definition && !$this->definitionVariables->offsetExists($callable[0]))
11911191
))) {
11921192
$initializer = 'fn () => '.$this->dumpValue($callable[0]);
11931193

11941194
return $return.LazyClosure::getCode($initializer, $callable, $class, $this->container, $id).$tail;
11951195
}
11961196

11971197
if ($callable[0] instanceof Reference
1198-
|| ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
1198+
|| ($callable[0] instanceof Definition && $this->definitionVariables->offsetExists($callable[0]))
11991199
) {
12001200
return $return.\sprintf('%s->%s(%s)', $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '').$tail;
12011201
}
@@ -1937,7 +1937,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
19371937
if ($value->hasErrors() && $e = $value->getErrors()) {
19381938
return \sprintf('throw new RuntimeException(%s)', $this->export(reset($e)));
19391939
}
1940-
if ($this->definitionVariables?->contains($value)) {
1940+
if ($this->definitionVariables?->offsetExists($value)) {
19411941
return $this->dumpValue($this->definitionVariables[$value], $interpolate);
19421942
}
19431943
if ($value->getMethodCalls()) {

src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private function preProcess(string $eventName): void
259259
$this->wrappedListeners[$eventName][] = $wrappedListener;
260260
$this->dispatcher->removeListener($eventName, $listener);
261261
$this->dispatcher->addListener($eventName, $wrappedListener, $priority);
262-
$this->callStack->attach($wrappedListener, [$eventName, $this->currentRequestHash]);
262+
$this->callStack[$wrappedListener] = [$eventName, $this->currentRequestHash];
263263
}
264264
}
265265

@@ -283,7 +283,7 @@ private function postProcess(string $eventName): void
283283
if ($listener->wasCalled()) {
284284
$this->logger?->debug('Notified event "{event}" to listener "{listener}".', $context);
285285
} else {
286-
$this->callStack->detach($listener);
286+
unset($this->callStack[$listener]);
287287
}
288288

289289
if (null !== $this->logger && $skipped) {

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ protected function setUp(): void
3535
// Normalize intl. configuration settings.
3636
if (\extension_loaded('intl')) {
3737
$this->initialTestCaseUseException = ini_set('intl.use_exceptions', 0);
38-
$this->initialTestCaseErrorLevel = ini_set('intl.error_level', 0);
3938
}
4039

4140
// Since we test against "de_AT", we need the full implementation
@@ -54,7 +53,6 @@ protected function tearDown(): void
5453

5554
if (\extension_loaded('intl')) {
5655
ini_set('intl.use_exceptions', $this->initialTestCaseUseException);
57-
ini_set('intl.error_level', $this->initialTestCaseErrorLevel);
5856
}
5957
}
6058

@@ -345,6 +343,7 @@ public function testReverseTransformFiveDigitYearsWithTimestamp()
345343

346344
/**
347345
* @requires extension intl
346+
* @requires PHP < 8.5
348347
*/
349348
public function testReverseTransformWrapsIntlErrorsWithErrorLevel()
350349
{
@@ -377,6 +376,7 @@ public function testReverseTransformWrapsIntlErrorsWithExceptions()
377376

378377
/**
379378
* @requires extension intl
379+
* @requires PHP < 8.5
380380
*/
381381
public function testReverseTransformWrapsIntlErrorsWithExceptionsAndErrorLevel()
382382
{

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ class NumberToLocalizedStringTransformerTest extends TestCase
2121
private string $defaultLocale;
2222

2323
private $initialTestCaseUseException;
24-
private $initialTestCaseErrorLevel;
2524

2625
protected function setUp(): void
2726
{
2827
// Normalize intl. configuration settings.
2928
if (\extension_loaded('intl')) {
3029
$this->initialTestCaseUseException = ini_set('intl.use_exceptions', 0);
31-
$this->initialTestCaseErrorLevel = ini_set('intl.error_level', 0);
3230
}
3331

3432
$this->defaultLocale = \Locale::getDefault();
@@ -41,7 +39,6 @@ protected function tearDown(): void
4139

4240
if (\extension_loaded('intl')) {
4341
ini_set('intl.use_exceptions', $this->initialTestCaseUseException);
44-
ini_set('intl.error_level', $this->initialTestCaseErrorLevel);
4542
}
4643
}
4744

@@ -664,6 +661,7 @@ public function testReverseTransformENotation($output, $input)
664661

665662
/**
666663
* @requires extension intl
664+
* @requires PHP < 8.5
667665
*/
668666
public function testReverseTransformWrapsIntlErrorsWithErrorLevel()
669667
{
@@ -696,6 +694,7 @@ public function testReverseTransformWrapsIntlErrorsWithExceptions()
696694

697695
/**
698696
* @requires extension intl
697+
* @requires PHP < 8.5
699698
*/
700699
public function testReverseTransformWrapsIntlErrorsWithExceptionsAndErrorLevel()
701700
{

src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ class PercentToLocalizedStringTransformerTest extends TestCase
2121
private string $defaultLocale;
2222

2323
private $initialTestCaseUseException;
24-
private $initialTestCaseErrorLevel;
2524

2625
protected function setUp(): void
2726
{
2827
// Normalize intl. configuration settings.
2928
if (\extension_loaded('intl')) {
3029
$this->initialTestCaseUseException = ini_set('intl.use_exceptions', 0);
31-
$this->initialTestCaseErrorLevel = ini_set('intl.error_level', 0);
3230
}
3331

3432
$this->defaultLocale = \Locale::getDefault();
@@ -41,7 +39,6 @@ protected function tearDown(): void
4139

4240
if (\extension_loaded('intl')) {
4341
ini_set('intl.use_exceptions', $this->initialTestCaseUseException);
44-
ini_set('intl.error_level', $this->initialTestCaseErrorLevel);
4542
}
4643
}
4744

@@ -492,6 +489,7 @@ public function testReverseTransformForHtml5FormatWithScale()
492489

493490
/**
494491
* @requires extension intl
492+
* @requires PHP < 8.5
495493
*/
496494
public function testReverseTransformWrapsIntlErrorsWithErrorLevel()
497495
{
@@ -524,6 +522,7 @@ public function testReverseTransformWrapsIntlErrorsWithExceptions()
524522

525523
/**
526524
* @requires extension intl
525+
* @requires PHP < 8.5
527526
*/
528527
public function testReverseTransformWrapsIntlErrorsWithExceptionsAndErrorLevel()
529528
{

src/Symfony/Component/HttpClient/Internal/CurlClientState.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public function reset(): void
8383
foreach ($this->pushedResponses as $url => $response) {
8484
$this->logger?->debug(\sprintf('Unused pushed response: "%s"', $url));
8585
curl_multi_remove_handle($this->handle, $response->handle);
86-
curl_close($response->handle);
8786
}
8887

8988
$this->pushedResponses = [];

src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
4040
$this->data['redirect'] = true;
4141
$this->data['url'] = $response->getTargetUrl();
4242

43-
if ($this->controllers->contains($request)) {
43+
if ($this->controllers->offsetExists($request)) {
4444
$this->data['route'] = $this->guessRoute($request, $this->controllers[$request]);
4545
}
4646
}

src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ protected function getNextTransport(): ?TransportInterface
8484
}
8585

8686
if ((microtime(true) - $this->deadTransports[$transport]) > $this->retryPeriod) {
87-
$this->deadTransports->detach($transport);
87+
unset($this->deadTransports[$transport]);
8888

8989
break;
9090
}
@@ -101,7 +101,7 @@ protected function getNextTransport(): ?TransportInterface
101101

102102
protected function isTransportDead(TransportInterface $transport): bool
103103
{
104-
return $this->deadTransports->contains($transport);
104+
return $this->deadTransports->offsetExists($transport);
105105
}
106106

107107
protected function getInitialCursor(): int

0 commit comments

Comments
 (0)