Skip to content

Commit ae61792

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 39f9427 + bcc7d5e commit ae61792

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

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
{

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
{

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
{

0 commit comments

Comments
 (0)