Skip to content

Commit ef4316a

Browse files
lkrmslkrms
committed
Merge branch 'fix-php84-deprecation-notice'
2 parents b1718d2 + 7e29b5e commit ef4316a

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
__DIR__ . '/tests/stubs/ADOConnection.stub',
1919
__DIR__ . '/tests/stubs/ADORecordSet.stub',
2020
__DIR__ . '/.php-cs-fixer.dist.php',
21-
])
22-
->notPath('Utility/Reflect/MyClassWithDnfTypes.php');
21+
]);
2322

2423
return (new PhpCsFixer\Config())
2524
->setRules([
@@ -29,6 +28,7 @@
2928
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
3029
'no_unneeded_import_alias' => true,
3130
'no_unused_imports' => true,
31+
'nullable_type_declaration_for_default_null_value' => true,
3232
'phpdoc_no_useless_inheritdoc' => true,
3333
'phpdoc_order' => ['order' => [
3434
'todo',

‎src/Toolkit/Http/OAuth2/OAuth2Client.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ final public function flushTokens()
482482
*
483483
* @return array<string,mixed>
484484
*/
485-
private function getValidJsonWebToken(string $token, bool $required = false, bool $refreshKeys = false, string $alg = null): ?array
485+
private function getValidJsonWebToken(string $token, bool $required = false, bool $refreshKeys = false, ?string $alg = null): ?array
486486
{
487487
$jwks = $this->getJsonWebKeySet($refreshKeys);
488488
if ($jwks === null) {

‎src/Toolkit/Sync/Support/SyncEntityFuzzyResolver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function __construct(
121121
/**
122122
* @inheritDoc
123123
*/
124-
public function getByName(string $name, float &$uncertainty = null): ?SyncEntityInterface
124+
public function getByName(string $name, ?float &$uncertainty = null): ?SyncEntityInterface
125125
{
126126
if ($this->Entities === null) {
127127
$this->loadEntities();

‎src/Toolkit/Utility/Regex.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public static function replace(
213213
$replacement,
214214
$subject,
215215
int $limit = -1,
216-
int &$count = null
216+
?int &$count = null
217217
) {
218218
$result = preg_replace($pattern, $replacement, $subject, $limit, $count);
219219
if ($result === null) {
@@ -250,7 +250,7 @@ public static function replaceCallback(
250250
callable $callback,
251251
$subject,
252252
int $limit = -1,
253-
int &$count = null,
253+
?int &$count = null,
254254
int $flags = 0
255255
) {
256256
$result = preg_replace_callback($pattern, $callback, $subject, $limit, $count, $flags);
@@ -286,7 +286,7 @@ public static function replaceCallbackArray(
286286
array $pattern,
287287
$subject,
288288
int $limit = -1,
289-
int &$count = null,
289+
?int &$count = null,
290290
int $flags = 0
291291
) {
292292
$result = preg_replace_callback_array($pattern, $subject, $limit, $count, $flags);

‎tests/fixtures/Toolkit/Utility/Reflect/MyClassWithDnfTypes.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ class MyClassWithDnfTypes extends MyClass
1313
/**
1414
* @param mixed $mixed
1515
* @param Countable&ArrayAccess<array-key,mixed> $intersection
16+
* @param (MyClass&Countable)|(MyClass&ArrayAccess<array-key,mixed>) $dnfByRef
1617
* @param mixed[]|MyClass $optionalArrayUnion
1718
* @param string|MyClass|(Countable&ArrayAccess<array-key,mixed>) $dnf
1819
* @param string|MyClass|(Countable&ArrayAccess<array-key,mixed>)|null $nullableDnf
1920
* @param mixed[]|MyClass|(Countable&ArrayAccess<array-key,mixed>) $optionalArrayDnf
20-
* @param null|string|MyClass|(Countable&ArrayAccess<array-key,mixed>) $nullableDnfByRef
21-
* @param null|(MyClass&Countable)|(MyClass&ArrayAccess<array-key,mixed>) $dnfByRef
21+
* @param string|MyClass|(Countable&ArrayAccess<array-key,mixed>)|null $nullableDnfByRef
2222
*/
2323
public function MyMethod(
2424
$mixed,
@@ -29,6 +29,7 @@ public function MyMethod(
2929
MyBaseClass $class,
3030
?MyClass $nullableClass,
3131
?MyClass &$nullableClassByRef,
32+
(MyClass&Countable)|(MyClass&ArrayAccess) &$dnfByRef,
3233
?MyClass $nullableAndOptionalClass = null,
3334
string $optionalString = MyClass::MY_CONSTANT,
3435
string|MyClass $union = SELF::MY_CONSTANT,
@@ -39,7 +40,6 @@ public function MyMethod(
3940
string|MyClass|(Countable&ArrayAccess)|null $nullableDnf = 'literal',
4041
array|MyClass|(Countable&ArrayAccess) $optionalArrayDnf = ['key' => 'value'],
4142
string|MyClass|(Countable&ArrayAccess)|null &$nullableDnfByRef = null,
42-
(MyClass&Countable)|(MyClass&ArrayAccess) &$dnfByRef = null,
4343
string &...$variadicByRef
4444
): MyClass|string|null {
4545
return null;

‎tests/unit/Toolkit/Utility/Reflect/ReflectTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ public static function getTypesProvider(): Generator
233233
['Salient\Tests\Utility\Reflect\MyBaseClass'],
234234
['Salient\Tests\Utility\Reflect\MyClass', 'null'],
235235
['Salient\Tests\Utility\Reflect\MyClass', 'null'],
236+
['Salient\Tests\Utility\Reflect\MyClass', 'Countable', 'ArrayAccess'],
236237
['Salient\Tests\Utility\Reflect\MyClass', 'null'],
237238
['string'],
238239
['Salient\Tests\Utility\Reflect\MyClass', 'string'],
@@ -243,16 +244,15 @@ public static function getTypesProvider(): Generator
243244
['Salient\Tests\Utility\Reflect\MyClass', 'Countable', 'ArrayAccess', 'string', 'null'],
244245
['Salient\Tests\Utility\Reflect\MyClass', 'Countable', 'ArrayAccess', 'array'],
245246
['Salient\Tests\Utility\Reflect\MyClass', 'Countable', 'ArrayAccess', 'string', 'null'],
246-
['Salient\Tests\Utility\Reflect\MyClass', 'Countable', 'ArrayAccess', 'null'],
247247
['string'],
248248
];
249249
$types = $allTypes;
250250
$types[4] = [['Countable', 'ArrayAccess']];
251-
$types[14] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string'];
252-
$types[15] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string', 'null'];
253-
$types[16] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'array'];
254-
$types[17] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string', 'null'];
255-
$types[18] = [['Salient\Tests\Utility\Reflect\MyClass', 'Countable'], ['Salient\Tests\Utility\Reflect\MyClass', 'ArrayAccess'], 'null'];
251+
$types[8] = [['Salient\Tests\Utility\Reflect\MyClass', 'Countable'], ['Salient\Tests\Utility\Reflect\MyClass', 'ArrayAccess']];
252+
$types[15] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string'];
253+
$types[16] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string', 'null'];
254+
$types[17] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'array'];
255+
$types[18] = ['Salient\Tests\Utility\Reflect\MyClass', ['Countable', 'ArrayAccess'], 'string', 'null'];
256256

257257
yield 'MyClassWithDnfTypes::MyMethod()' => [
258258
$types,
@@ -581,6 +581,7 @@ public static function getTypeDeclarationProvider(): Generator
581581
'\Salient\Tests\Utility\Reflect\MyBaseClass',
582582
'?MyClass',
583583
'?MyClass',
584+
'(MyClass&\Countable)|(MyClass&\ArrayAccess)',
584585
'?MyClass',
585586
'string',
586587
'MyClass|string',
@@ -591,7 +592,6 @@ public static function getTypeDeclarationProvider(): Generator
591592
'MyClass|(\Countable&\ArrayAccess)|string|null',
592593
'MyClass|(\Countable&\ArrayAccess)|array',
593594
'MyClass|(\Countable&\ArrayAccess)|string|null',
594-
'(MyClass&\Countable)|(MyClass&\ArrayAccess)|null',
595595
'string',
596596
],
597597
MyClassWithDnfTypes::class,
@@ -670,6 +670,7 @@ public static function getParameterDeclarationProvider(): Generator
670670
'Salient\Tests\Utility\Reflect\MyBaseClass $class',
671671
'?MyClass $nullableClass',
672672
'?MyClass &$nullableClassByRef',
673+
'(MyClass&Countable)|(MyClass&ArrayAccess) &$dnfByRef',
673674
'?MyClass $nullableAndOptionalClass = null',
674675
'string $optionalString = MyClass::MY_CONSTANT',
675676
'MyClass|string $union = SELF::MY_CONSTANT',
@@ -680,7 +681,6 @@ public static function getParameterDeclarationProvider(): Generator
680681
"MyClass|(Countable&ArrayAccess)|string|null \$nullableDnf = 'literal'",
681682
"MyClass|(Countable&ArrayAccess)|array \$optionalArrayDnf = ['key'=>'value']",
682683
'MyClass|(Countable&ArrayAccess)|string|null &$nullableDnfByRef = null',
683-
'(MyClass&Countable)|(MyClass&ArrayAccess)|null &$dnfByRef = null',
684684
'string &...$variadicByRef',
685685
],
686686
MyClassWithDnfTypes::class,
@@ -1036,7 +1036,7 @@ class MyClass extends MyBaseClass implements MyInterface
10361036
/**
10371037
* @param int|string $id
10381038
*/
1039-
public function __construct($id, ?int $altId, string $name, ?MyClass $parent, MyClass $altParent = null)
1039+
public function __construct($id, ?int $altId, string $name, ?MyClass $parent, ?MyClass $altParent = null)
10401040
{
10411041
$this->Id = $id;
10421042
$this->AltId = $altId;

0 commit comments

Comments
 (0)