Skip to content

Commit db41038

Browse files
committed
Fix PHP 8.5 deprecations
Signed-off-by: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
1 parent 5303ac8 commit db41038

3 files changed

Lines changed: 58 additions & 13 deletions

File tree

src/Tools/CustomJsonSerializer.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
use function in_array;
1212

13+
use const PHP_VERSION_ID;
14+
1315
/**
1416
* Used for .out files generation
1517
*/
@@ -64,7 +66,10 @@ protected function extractObjectData($value, $ref, $properties)
6466

6567
try {
6668
$propRef = $ref->getProperty($property);
67-
$propRef->setAccessible(true);
69+
if (PHP_VERSION_ID < 80100) {
70+
$propRef->setAccessible(true);
71+
}
72+
6873
$data[$property] = $propRef->getValue($value);
6974
} catch (ReflectionException $e) {
7075
$data[$property] = $value->$property;

tests/Misc/TranslatorTest.php

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,24 @@
1313

1414
use function realpath;
1515

16+
use const PHP_VERSION_ID;
17+
1618
/** @covers \PhpMyAdmin\SqlParser\Translator */
1719
final class TranslatorTest extends TestCase
1820
{
1921
public static function tearDownAfterClass(): void
2022
{
2123
$loaderProperty = new ReflectionProperty(Translator::class, 'loader');
22-
$loaderProperty->setAccessible(true);
24+
if (PHP_VERSION_ID < 80100) {
25+
$loaderProperty->setAccessible(true);
26+
}
27+
2328
$loaderProperty->setValue(null, null);
2429
$translatorProperty = new ReflectionProperty(Translator::class, 'translator');
25-
$translatorProperty->setAccessible(true);
30+
if (PHP_VERSION_ID < 80100) {
31+
$translatorProperty->setAccessible(true);
32+
}
33+
2634
$translatorProperty->setValue(null, null);
2735
Translator::setLocale('en');
2836
}
@@ -46,10 +54,16 @@ public function testLocale(): void
4654
public function testLoad(?string $globalLang, string $locale, string $expectedLocale): void
4755
{
4856
$loaderProperty = new ReflectionProperty(Translator::class, 'loader');
49-
$loaderProperty->setAccessible(true);
57+
if (PHP_VERSION_ID < 80100) {
58+
$loaderProperty->setAccessible(true);
59+
}
60+
5061
$loaderProperty->setValue(null, null);
5162
$translatorProperty = new ReflectionProperty(Translator::class, 'translator');
52-
$translatorProperty->setAccessible(true);
63+
if (PHP_VERSION_ID < 80100) {
64+
$translatorProperty->setAccessible(true);
65+
}
66+
5367
$translatorProperty->setValue(null, null);
5468
$GLOBALS['lang'] = $globalLang;
5569
Translator::setLocale($locale);
@@ -62,16 +76,25 @@ public function testLoad(?string $globalLang, string $locale, string $expectedLo
6276
self::assertInstanceOf(Loader::class, $loader);
6377
$loaderClass = new ReflectionClass(Loader::class);
6478
$localeProperty = $loaderClass->getProperty('locale');
65-
$localeProperty->setAccessible(true);
79+
if (PHP_VERSION_ID < 80100) {
80+
$localeProperty->setAccessible(true);
81+
}
82+
6683
self::assertSame($expectedLocale, $localeProperty->getValue($loader));
6784
// Compatibility with MoTranslator < 5
6885
$defaultDomainProperty = $loaderClass->hasProperty('default_domain')
6986
? $loaderClass->getProperty('default_domain')
7087
: $loaderClass->getProperty('defaultDomain');
71-
$defaultDomainProperty->setAccessible(true);
88+
if (PHP_VERSION_ID < 80100) {
89+
$defaultDomainProperty->setAccessible(true);
90+
}
91+
7292
self::assertSame('sqlparser', $defaultDomainProperty->getValue($loader));
7393
$pathsProperty = $loaderClass->getProperty('paths');
74-
$pathsProperty->setAccessible(true);
94+
if (PHP_VERSION_ID < 80100) {
95+
$pathsProperty->setAccessible(true);
96+
}
97+
7598
self::assertSame(
7699
['' => './', 'sqlparser' => realpath(__DIR__ . '/../../src/') . '/../locale/'],
77100
$pathsProperty->getValue($loader)
@@ -81,10 +104,16 @@ public function testLoad(?string $globalLang, string $locale, string $expectedLo
81104
public function testGettext(): void
82105
{
83106
$loaderProperty = new ReflectionProperty(Translator::class, 'loader');
84-
$loaderProperty->setAccessible(true);
107+
if (PHP_VERSION_ID < 80100) {
108+
$loaderProperty->setAccessible(true);
109+
}
110+
85111
$loaderProperty->setValue(null, null);
86112
$translatorProperty = new ReflectionProperty(Translator::class, 'translator');
87-
$translatorProperty->setAccessible(true);
113+
if (PHP_VERSION_ID < 80100) {
114+
$translatorProperty->setAccessible(true);
115+
}
116+
88117
$translatorProperty->setValue(null, null);
89118
Translator::setLocale('pt_BR');
90119
self::assertSame(
@@ -93,10 +122,16 @@ public function testGettext(): void
93122
);
94123

95124
$loaderProperty = new ReflectionProperty(Translator::class, 'loader');
96-
$loaderProperty->setAccessible(true);
125+
if (PHP_VERSION_ID < 80100) {
126+
$loaderProperty->setAccessible(true);
127+
}
128+
97129
$loaderProperty->setValue(null, null);
98130
$translatorProperty = new ReflectionProperty(Translator::class, 'translator');
99-
$translatorProperty->setAccessible(true);
131+
if (PHP_VERSION_ID < 80100) {
132+
$translatorProperty->setAccessible(true);
133+
}
134+
100135
$translatorProperty->setValue(null, null);
101136
Translator::setLocale('en');
102137
self::assertSame(

tests/Utils/FormatterTest.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
use PhpMyAdmin\SqlParser\Utils\Formatter;
99
use ReflectionMethod;
1010

11+
use const PHP_VERSION_ID;
12+
1113
class FormatterTest extends TestCase
1214
{
1315
/**
@@ -54,7 +56,10 @@ public function testMergeFormats(array $default, array $overriding, array $expec
5456
];
5557

5658
$reflectionMethod = new ReflectionMethod($formatter, 'getMergedOptions');
57-
$reflectionMethod->setAccessible(true);
59+
if (PHP_VERSION_ID < 80100) {
60+
$reflectionMethod->setAccessible(true);
61+
}
62+
5863
$this->assertEquals($expectedOptions, $reflectionMethod->invoke($formatter, $overridingOptions));
5964
}
6065

0 commit comments

Comments
 (0)