Skip to content

Commit 19d4bb8

Browse files
jrfnljrfnl
committed
Merge branch 'master' into 4.x
2 parents c0271bd + 03359eb commit 19d4bb8

File tree

7 files changed

+112
-112
lines changed

7 files changed

+112
-112
lines changed

‎tests/Core/Ruleset/PropertyTypeHandlingTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ public static function dataArrayPropertyExtending()
271271
'expected' => [
272272
'predefinedA' => 'true',
273273
'predefinedB' => ' null ',
274-
'newValueA' => false,
275-
'newValueB' => null,
274+
'newValueA' => false,
275+
'newValueB' => null,
276276
'1.5', // phpcs:ignore Squiz.Arrays.ArrayDeclaration.NoKeySpecified -- That is largely what we are testing...
277277
true,
278278
],

‎tests/Core/Tokenizers/PHP/ArrayKeywordTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public static function dataArrayType()
135135
'testMarker' => '/* testFunctionDeclarationParamDNFType */',
136136
],
137137
'closure param DNF type' => [
138-
'testMarker' => '/* testClosureDeclarationParamDNFType */',
138+
'testMarker' => '/* testClosureDeclarationParamDNFType */',
139139
],
140140
'arrow return DNF type' => [
141141
'testMarker' => '/* testArrowDeclarationReturnDNFType */',

‎tests/Core/Tokenizers/PHP/AttributesTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public static function dataAttribute()
7474
'class attribute' => [
7575
'testMarker' => '/* testAttribute */',
7676
'tokenCodes' => [
77-
T_STRING
77+
T_STRING,
7878
],
7979
],
8080
'class attribute with param' => [
@@ -105,7 +105,7 @@ public static function dataAttribute()
105105
'function attribute' => [
106106
'testMarker' => '/* testAttributeOnFunction */',
107107
'tokenCodes' => [
108-
T_STRING
108+
T_STRING,
109109
],
110110
],
111111
'function attribute with params' => [
@@ -384,7 +384,7 @@ public static function dataAttributeOnParameters()
384384
'testMarker' => '/* testSingleAttributeOnParameter */',
385385
'position' => 4,
386386
'tokenCodes' => [
387-
T_STRING
387+
T_STRING,
388388
],
389389
],
390390
'parameter attribute; multiple comma separated, inline' => [

‎tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public static function dataSimple()
4646
{
4747
return [
4848
'standard' => [
49-
'testMarker' => '/* testStandard */',
49+
'testMarker' => '/* testStandard */',
5050
],
5151
'mixed case' => [
52-
'testMarker' => '/* testMixedCase */',
52+
'testMarker' => '/* testMixedCase */',
5353
],
5454
];
5555

@@ -456,37 +456,37 @@ public static function dataKeywordReturnTypes()
456456
{
457457
return [
458458
'self' => [
459-
'testMarker' => '/* testSelfReturnType */',
459+
'testMarker' => '/* testSelfReturnType */',
460460
],
461461
'parent' => [
462-
'testMarker' => '/* testParentReturnType */',
462+
'testMarker' => '/* testParentReturnType */',
463463
],
464464
'callable' => [
465-
'testMarker' => '/* testCallableReturnType */',
465+
'testMarker' => '/* testCallableReturnType */',
466466
],
467467
'array' => [
468-
'testMarker' => '/* testArrayReturnType */',
468+
'testMarker' => '/* testArrayReturnType */',
469469
],
470470
'static' => [
471-
'testMarker' => '/* testStaticReturnType */',
471+
'testMarker' => '/* testStaticReturnType */',
472472
],
473473
'false' => [
474-
'testMarker' => '/* testFalseReturnType */',
474+
'testMarker' => '/* testFalseReturnType */',
475475
],
476476
'true' => [
477-
'testMarker' => '/* testTrueReturnType */',
477+
'testMarker' => '/* testTrueReturnType */',
478478
],
479479
'null' => [
480-
'testMarker' => '/* testNullReturnType */',
480+
'testMarker' => '/* testNullReturnType */',
481481
],
482482
'FQN false' => [
483-
'testMarker' => '/* testFQNFalseReturnType */',
483+
'testMarker' => '/* testFQNFalseReturnType */',
484484
],
485485
'FQN true' => [
486-
'testMarker' => '/* testFQNTrueReturnType */',
486+
'testMarker' => '/* testFQNTrueReturnType */',
487487
],
488488
'FQN null' => [
489-
'testMarker' => '/* testFQNNullReturnType */',
489+
'testMarker' => '/* testFQNNullReturnType */',
490490
],
491491
];
492492

‎tests/Core/Tokenizers/PHP/DNFTypesTest.php

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -386,159 +386,159 @@ public static function dataDNFTypeParentheses()
386386
{
387387
return [
388388
'arrow function return type: in named parameter' => [
389-
'testMarker' => '/* testDNFTypeArrowFnReturnInNamedParam */',
389+
'testMarker' => '/* testDNFTypeArrowFnReturnInNamedParam */',
390390
],
391391
'closure return type: in named parameter' => [
392-
'testMarker' => '/* testDNFTypeClosureReturnInNamedParam */',
392+
'testMarker' => '/* testDNFTypeClosureReturnInNamedParam */',
393393
],
394394

395395
'OO const type: unqualified classes' => [
396-
'testMarker' => '/* testDNFTypeOOConstUnqualifiedClasses */',
396+
'testMarker' => '/* testDNFTypeOOConstUnqualifiedClasses */',
397397
],
398398
'OO const type: modifiers in reverse order' => [
399-
'testMarker' => '/* testDNFTypeOOConstReverseModifierOrder */',
399+
'testMarker' => '/* testDNFTypeOOConstReverseModifierOrder */',
400400
],
401401
'OO const type: multi-dnf part 1' => [
402-
'testMarker' => '/* testDNFTypeOOConstMulti1 */',
402+
'testMarker' => '/* testDNFTypeOOConstMulti1 */',
403403
],
404404
'OO const type: multi-dnf part 2' => [
405-
'testMarker' => '/* testDNFTypeOOConstMulti2 */',
405+
'testMarker' => '/* testDNFTypeOOConstMulti2 */',
406406
],
407407
'OO const type: multi-dnf part 3' => [
408-
'testMarker' => '/* testDNFTypeOOConstMulti3 */',
408+
'testMarker' => '/* testDNFTypeOOConstMulti3 */',
409409
],
410410
'OO const type: namespace relative classes' => [
411-
'testMarker' => '/* testDNFTypeOOConstNamespaceRelative */',
411+
'testMarker' => '/* testDNFTypeOOConstNamespaceRelative */',
412412
],
413413
'OO const type: partially qualified classes' => [
414-
'testMarker' => '/* testDNFTypeOOConstPartiallyQualified */',
414+
'testMarker' => '/* testDNFTypeOOConstPartiallyQualified */',
415415
],
416416
'OO const type: fully qualified classes' => [
417-
'testMarker' => '/* testDNFTypeOOConstFullyQualified */',
417+
'testMarker' => '/* testDNFTypeOOConstFullyQualified */',
418418
],
419419

420420
'OO property type: unqualified classes' => [
421-
'testMarker' => '/* testDNFTypePropertyUnqualifiedClasses */',
421+
'testMarker' => '/* testDNFTypePropertyUnqualifiedClasses */',
422422
],
423423
'OO property type: modifiers in reverse order' => [
424-
'testMarker' => '/* testDNFTypePropertyReverseModifierOrder */',
424+
'testMarker' => '/* testDNFTypePropertyReverseModifierOrder */',
425425
],
426426
'OO property type: multi-dnf namespace relative classes' => [
427-
'testMarker' => '/* testDNFTypePropertyMultiNamespaceRelative */',
427+
'testMarker' => '/* testDNFTypePropertyMultiNamespaceRelative */',
428428
],
429429
'OO property type: multi-dnf partially qualified classes' => [
430-
'testMarker' => '/* testDNFTypePropertyMultiPartiallyQualified */',
430+
'testMarker' => '/* testDNFTypePropertyMultiPartiallyQualified */',
431431
],
432432
'OO property type: multi-dnf fully qualified classes' => [
433-
'testMarker' => '/* testDNFTypePropertyMultiFullyQualified */',
433+
'testMarker' => '/* testDNFTypePropertyMultiFullyQualified */',
434434
],
435435
'OO property type: multi-dnf with readonly keyword 1' => [
436-
'testMarker' => '/* testDNFTypePropertyWithReadOnlyKeyword1 */',
436+
'testMarker' => '/* testDNFTypePropertyWithReadOnlyKeyword1 */',
437437
],
438438
'OO property type: multi-dnf with readonly keyword 2' => [
439-
'testMarker' => '/* testDNFTypePropertyWithReadOnlyKeyword2 */',
439+
'testMarker' => '/* testDNFTypePropertyWithReadOnlyKeyword2 */',
440440
],
441441
'OO property type: with static and readonly keywords' => [
442-
'testMarker' => '/* testDNFTypePropertyWithStaticAndReadOnlyKeywords */',
442+
'testMarker' => '/* testDNFTypePropertyWithStaticAndReadOnlyKeywords */',
443443
],
444444
'OO property type: with only static keyword' => [
445-
'testMarker' => '/* testDNFTypePropertyWithOnlyStaticKeyword */',
445+
'testMarker' => '/* testDNFTypePropertyWithOnlyStaticKeyword */',
446446
],
447447
'OO property type: with only final keyword' => [
448-
'testMarker' => '/* testDNFTypeWithPHP84FinalKeyword */',
448+
'testMarker' => '/* testDNFTypeWithPHP84FinalKeyword */',
449449
],
450450
'OO property type: with final and static keyword' => [
451-
'testMarker' => '/* testDNFTypeWithPHP84FinalKeywordAndStatic */',
451+
'testMarker' => '/* testDNFTypeWithPHP84FinalKeywordAndStatic */',
452452
],
453453

454454
'OO method param type: first param' => [
455-
'testMarker' => '/* testDNFTypeParam1WithAttribute */',
455+
'testMarker' => '/* testDNFTypeParam1WithAttribute */',
456456
],
457457
'OO method param type: second param, first DNF' => [
458-
'testMarker' => '/* testDNFTypeParam2 */',
458+
'testMarker' => '/* testDNFTypeParam2 */',
459459
],
460460
'OO method param type: second param, second DNF' => [
461-
'testMarker' => '/* testDNFTypeParam3 */',
461+
'testMarker' => '/* testDNFTypeParam3 */',
462462
],
463463
'OO method param type: namespace relative classes' => [
464-
'testMarker' => '/* testDNFTypeParamNamespaceRelative */',
464+
'testMarker' => '/* testDNFTypeParamNamespaceRelative */',
465465
],
466466
'OO method param type: partially qualified classes' => [
467-
'testMarker' => '/* testDNFTypeParamPartiallyQualified */',
467+
'testMarker' => '/* testDNFTypeParamPartiallyQualified */',
468468
],
469469
'OO method param type: fully qualified classes' => [
470-
'testMarker' => '/* testDNFTypeParamFullyQualified */',
470+
'testMarker' => '/* testDNFTypeParamFullyQualified */',
471471
],
472472
'Constructor property promotion with multi DNF 1' => [
473-
'testMarker' => '/* testDNFTypeConstructorPropertyPromotion1 */',
473+
'testMarker' => '/* testDNFTypeConstructorPropertyPromotion1 */',
474474
],
475475
'Constructor property promotion with multi DNF 2' => [
476-
'testMarker' => '/* testDNFTypeConstructorPropertyPromotion2 */',
476+
'testMarker' => '/* testDNFTypeConstructorPropertyPromotion2 */',
477477
],
478478
'OO method return type: multi DNF 1' => [
479-
'testMarker' => '/* testDNFTypeReturnType1 */',
479+
'testMarker' => '/* testDNFTypeReturnType1 */',
480480
],
481481
'OO method return type: multi DNF 2' => [
482-
'testMarker' => '/* testDNFTypeReturnType2 */',
482+
'testMarker' => '/* testDNFTypeReturnType2 */',
483483
],
484484
'OO abstract method return type: multi DNF 1' => [
485-
'testMarker' => '/* testDNFTypeAbstractMethodReturnType1 */',
485+
'testMarker' => '/* testDNFTypeAbstractMethodReturnType1 */',
486486
],
487487
'OO abstract method return type: multi DNF 2' => [
488-
'testMarker' => '/* testDNFTypeAbstractMethodReturnType2 */',
488+
'testMarker' => '/* testDNFTypeAbstractMethodReturnType2 */',
489489
],
490490
'OO method return type: namespace relative classes' => [
491-
'testMarker' => '/* testDNFTypeReturnTypeNamespaceRelative */',
491+
'testMarker' => '/* testDNFTypeReturnTypeNamespaceRelative */',
492492
],
493493
'OO method return type: partially qualified classes' => [
494-
'testMarker' => '/* testDNFTypeReturnPartiallyQualified */',
494+
'testMarker' => '/* testDNFTypeReturnPartiallyQualified */',
495495
],
496496
'OO method return type: fully qualified classes' => [
497-
'testMarker' => '/* testDNFTypeReturnFullyQualified */',
497+
'testMarker' => '/* testDNFTypeReturnFullyQualified */',
498498
],
499499
'OO method param type: fully qualified true' => [
500-
'testMarker' => '/* testDNFTypeFQNTrue */',
500+
'testMarker' => '/* testDNFTypeFQNTrue */',
501501
],
502502
'OO method return type: fully qualified false' => [
503-
'testMarker' => '/* testDNFTypeFQNFalse */',
503+
'testMarker' => '/* testDNFTypeFQNFalse */',
504504
],
505505
'closure return type: fully qualified null' => [
506-
'testMarker' => '/* testDNFTypeFQNNull */',
506+
'testMarker' => '/* testDNFTypeFQNNull */',
507507
],
508508
'function param type: with reference' => [
509-
'testMarker' => '/* testDNFTypeWithReference */',
509+
'testMarker' => '/* testDNFTypeWithReference */',
510510
],
511511
'function param type: with spread' => [
512-
'testMarker' => '/* testDNFTypeWithSpreadOperator */',
512+
'testMarker' => '/* testDNFTypeWithSpreadOperator */',
513513
],
514514
'closure param type: with illegal nullable' => [
515-
'testMarker' => '/* testDNFTypeClosureParamIllegalNullable */',
515+
'testMarker' => '/* testDNFTypeClosureParamIllegalNullable */',
516516
],
517517
'closure return type' => [
518-
'testMarker' => '/* testDNFTypeClosureReturn */',
518+
'testMarker' => '/* testDNFTypeClosureReturn */',
519519
],
520520
'closure with use return type' => [
521-
'testMarker' => '/* testDNFTypeClosureWithUseReturn */',
521+
'testMarker' => '/* testDNFTypeClosureWithUseReturn */',
522522
],
523523

524524
'arrow function param type' => [
525-
'testMarker' => '/* testDNFTypeArrowParam */',
525+
'testMarker' => '/* testDNFTypeArrowParam */',
526526
],
527527
'arrow function return type' => [
528-
'testMarker' => '/* testDNFTypeArrowReturnType */',
528+
'testMarker' => '/* testDNFTypeArrowReturnType */',
529529
],
530530
'arrow function param type with return by ref' => [
531-
'testMarker' => '/* testDNFTypeArrowParamWithReturnByRef */',
531+
'testMarker' => '/* testDNFTypeArrowParamWithReturnByRef */',
532532
],
533533

534534
'illegal syntax: unnecessary parentheses (no union)' => [
535-
'testMarker' => '/* testDNFTypeParamIllegalUnnecessaryParens */',
535+
'testMarker' => '/* testDNFTypeParamIllegalUnnecessaryParens */',
536536
],
537537
'illegal syntax: union within parentheses, intersect outside' => [
538-
'testMarker' => '/* testDNFTypeParamIllegalIntersectUnionReversed */',
538+
'testMarker' => '/* testDNFTypeParamIllegalIntersectUnionReversed */',
539539
],
540540
'illegal syntax: nested parentheses' => [
541-
'testMarker' => '/* testDNFTypeParamIllegalNestedParens */',
541+
'testMarker' => '/* testDNFTypeParamIllegalNestedParens */',
542542
],
543543
];
544544

0 commit comments

Comments
 (0)