Skip to content

Commit 0ea262c

Browse files
committed
Merge branch 'master' into 4.x
2 parents 9512d68 + d7a7cca commit 0ea262c

13 files changed

+72
-0
lines changed

src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ $anon = new ReadOnly class() {};
1818
class FinalProperties {
1919
FINAL int $prop = 1;
2020
}
21+
22+
ABSTRACT class AbstractProperties {
23+
Abstract int $prop {set;}
24+
}

src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc.fixed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ $anon = new readonly class() {};
1818
class FinalProperties {
1919
final int $prop = 1;
2020
}
21+
22+
abstract class AbstractProperties {
23+
abstract int $prop {set;}
24+
}

src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ public function getErrorList()
4242
14 => 1,
4343
16 => 1,
4444
19 => 1,
45+
22 => 1,
46+
23 => 1,
4547
];
4648

4749
return $errors;

src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,3 +331,10 @@ class AsymVisibility {
331331
*/
332332
private(set) int $prop = 1;
333333
}
334+
335+
abstract class AbstractProperties {
336+
/**
337+
* Comment should be ignored.
338+
*/
339+
abstract int $prop {get;}
340+
}

src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc.fixed

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,10 @@ class AsymVisibility {
333333
*/
334334
private(set) int $prop = 1;
335335
}
336+
337+
abstract class AbstractProperties {
338+
/**
339+
* Comment should be ignored.
340+
*/
341+
abstract int $prop {get;}
342+
}

src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,16 @@ class AsymVisibility {
131131
*/
132132
private(set) int $prop = 1;
133133
}
134+
135+
/**
136+
* Some info about the class here.
137+
*/
138+
abstract class AbstractClassWithAbstractProp
139+
{
140+
/**
141+
*Some info about the property here.
142+
*
143+
* @var int
144+
*/
145+
abstract $property {get;}
146+
}

src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc.fixed

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,3 +131,16 @@ class AsymVisibility {
131131
*/
132132
private(set) int $prop = 1;
133133
}
134+
135+
/**
136+
* Some info about the class here.
137+
*/
138+
abstract class AbstractClassWithAbstractProp
139+
{
140+
/**
141+
* Some info about the property here.
142+
*
143+
* @var int
144+
*/
145+
abstract $property {get;}
146+
}

src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ public function getErrorList()
6161
121 => 1,
6262
125 => 1,
6363
126 => 1,
64+
136 => 1,
65+
137 => 1,
66+
141 => 2,
67+
142 => 1,
68+
143 => 1,
69+
144 => 1,
6470
];
6571

6672
}//end getErrorList()

src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.1.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,7 @@ class AsymVisibility {
8585
protected(set) public $asymPublicProtected = 'hello';
8686
protected private(set) $asymProtectedPrivate = 'hello';
8787
}
88+
89+
abstract class PHP84AbstractProperties {
90+
abstract string $abstract {get;}
91+
}

src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public function getErrorList($testFile='')
4848
80 => 1,
4949
81 => 1,
5050
82 => 1,
51+
90 => 1,
5152
];
5253

5354
default:

0 commit comments

Comments
 (0)