Skip to content

Commit 7903671

Browse files
ostroluckyostrolucky
authored
Merge pull request #283 from greg0ire/require-cpp
2 parents 720492b + b7e1a4b commit 7903671

File tree

7 files changed

+125
-131
lines changed

7 files changed

+125
-131
lines changed

‎lib/Doctrine/ruleset.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@
144144
<property name="enableMultipleSpacesBetweenModifiersCheck" value="true"/>
145145
</properties>
146146
</rule>
147+
<!-- Require usage of constructor property promotion -->
148+
<rule ref="SlevomatCodingStandard.Classes.RequireConstructorPropertyPromotion"/>
147149
<!-- Forbid uses of multiple traits separated by comma -->
148150
<rule ref="SlevomatCodingStandard.Classes.TraitUseDeclaration"/>
149151
<!-- Require no spaces before trait use, between trait uses and one space after trait uses -->

‎tests/expected_report.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tests/input/ControlStructures.php 28 0
1515
tests/input/doc-comment-spacing.php 11 0
1616
tests/input/duplicate-assignment-variable.php 1 0
1717
tests/input/EarlyReturn.php 7 0
18-
tests/input/example-class.php 43 0
18+
tests/input/example-class.php 44 0
1919
tests/input/ExampleBackedEnum.php 3 0
2020
tests/input/Exceptions.php 1 0
2121
tests/input/forbidden-comments.php 14 0
@@ -50,9 +50,9 @@ tests/input/use-ordering.php 1 0
5050
tests/input/useless-semicolon.php 2 0
5151
tests/input/UselessConditions.php 21 0
5252
----------------------------------------------------------------------
53-
A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
53+
A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
5454
----------------------------------------------------------------------
55-
PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
55+
PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5656
----------------------------------------------------------------------
5757

5858

‎tests/fixed/example-class.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,10 @@ class Example implements IteratorAggregate
2525
{
2626
private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
2727

28-
private int|null $foo = null;
29-
30-
/** @var string[] */
31-
private array $bar;
32-
33-
private bool $baz;
34-
3528
private ControlStructureSniff|int|string|null $baxBax = null;
3629

37-
public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
30+
public function __construct(private int|null $foo = null, private array $bar = [], private bool $baz = false, $baxBax = 'unused')
3831
{
39-
$this->foo = $foo;
40-
$this->bar = $bar;
41-
$this->baz = $baz;
4232
$this->baxBax = $baxBax;
4333
}
4434

‎tests/php72-compatibility.patch‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
diff --git a/tests/expected_report.txt b/tests/expected_report.txt
2-
index d53fd48..53dada5 100644
2+
index 5110131..53dada5 100644
33
--- a/tests/expected_report.txt
44
+++ b/tests/expected_report.txt
55
@@ -14,26 +14,23 @@ tests/input/constants-var.php 7 0
66
tests/input/ControlStructures.php 28 0
77
tests/input/doc-comment-spacing.php 11 0
88
tests/input/duplicate-assignment-variable.php 1 0
99
-tests/input/EarlyReturn.php 7 0
10-
-tests/input/example-class.php 43 0
10+
-tests/input/example-class.php 44 0
1111
-tests/input/ExampleBackedEnum.php 3 0
1212
-tests/input/Exceptions.php 1 0
1313
+tests/input/EarlyReturn.php 6 0
@@ -51,10 +51,10 @@ index d53fd48..53dada5 100644
5151
-tests/input/UselessConditions.php 21 0
5252
+tests/input/UselessConditions.php 20 0
5353
----------------------------------------------------------------------
54-
-A TOTAL OF 428 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
54+
-A TOTAL OF 429 ERRORS AND 0 WARNINGS WERE FOUND IN 46 FILES
5555
+A TOTAL OF 382 ERRORS AND 0 WARNINGS WERE FOUND IN 42 FILES
5656
----------------------------------------------------------------------
57-
-PHPCBF CAN FIX 363 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
57+
-PHPCBF CAN FIX 364 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5858
+PHPCBF CAN FIX 317 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
5959
----------------------------------------------------------------------
6060

@@ -63,7 +63,7 @@ diff --git a/tests/fixed/ControlStructures.php b/tests/fixed/ControlStructures.p
6363
index f8f7f65..a653086 100644
6464
--- a/tests/fixed/ControlStructures.php
6565
+++ b/tests/fixed/ControlStructures.php
66-
@@ -104,7 +104,7 @@ class ControlStructures
66+
@@ -104,7 +104,7 @@ public function spaceBelowBlocks(): void
6767

6868
try {
6969
echo 4;
@@ -76,7 +76,7 @@ diff --git a/tests/fixed/EarlyReturn.php b/tests/fixed/EarlyReturn.php
7676
index fc734db..caf1dbb 100644
7777
--- a/tests/fixed/EarlyReturn.php
7878
+++ b/tests/fixed/EarlyReturn.php
79-
@@ -11,7 +11,7 @@ class EarlyReturn
79+
@@ -11,7 +11,7 @@ public function bar(): bool
8080
return $bar === 'bar';
8181
}
8282

@@ -117,7 +117,7 @@ diff --git a/tests/fixed/NamingCamelCase.php b/tests/fixed/NamingCamelCase.php
117117
index 5493471..57d9f2b 100644
118118
--- a/tests/fixed/NamingCamelCase.php
119119
+++ b/tests/fixed/NamingCamelCase.php
120-
@@ -6,11 +6,14 @@ namespace Example;
120+
@@ -6,11 +6,14 @@
121121

122122
class NamingCamelCase
123123
{
@@ -155,7 +155,7 @@ diff --git a/tests/fixed/TrailingCommaOnFunctions.php b/tests/fixed/TrailingComm
155155
index 4248238..f3ffa91 100644
156156
--- a/tests/fixed/TrailingCommaOnFunctions.php
157157
+++ b/tests/fixed/TrailingCommaOnFunctions.php
158-
@@ -15,7 +15,7 @@ class TrailingCommaOnFunctions
158+
@@ -15,7 +15,7 @@ public function a(int $arg): void
159159
}
160160

161161
public function b(
@@ -164,7 +164,7 @@ index 4248238..f3ffa91 100644
164164
): void {
165165
}
166166

167-
@@ -28,7 +28,7 @@ class TrailingCommaOnFunctions
167+
@@ -28,7 +28,7 @@ public function uses(): void
168168
};
169169

170170
$multiLine = static function (int $arg) use (
@@ -173,7 +173,7 @@ index 4248238..f3ffa91 100644
173173
): void {
174174
var_dump($var);
175175
};
176-
@@ -37,9 +37,8 @@ class TrailingCommaOnFunctions
176+
@@ -37,9 +37,8 @@ public function uses(): void
177177

178178
$class = new TrailingCommaOnFunctions();
179179

@@ -188,7 +188,7 @@ diff --git a/tests/fixed/UselessConditions.php b/tests/fixed/UselessConditions.p
188188
index 71e0cfb..2151b17 100644
189189
--- a/tests/fixed/UselessConditions.php
190190
+++ b/tests/fixed/UselessConditions.php
191-
@@ -95,7 +95,7 @@ class UselessConditions
191+
@@ -95,7 +95,7 @@ public function necessaryIfConditionWithMethodCall(): bool
192192
return false;
193193
}
194194

@@ -201,7 +201,7 @@ diff --git a/tests/fixed/arrow-functions-format.php b/tests/fixed/arrow-function
201201
index 4da39b8..a45074f 100644
202202
--- a/tests/fixed/arrow-functions-format.php
203203
+++ b/tests/fixed/arrow-functions-format.php
204-
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
204+
@@ -18,10 +18,10 @@
205205

206206
$multiLineArrowFunctions = Collection::from([1, 2])
207207
->map(
@@ -215,35 +215,35 @@ index 4da39b8..a45074f 100644
215215

216216
$thisIsNotAnArrowFunction = [$this->fn => 'value'];
217217
diff --git a/tests/fixed/example-class.php b/tests/fixed/example-class.php
218-
index 56cd902..998e51d 100644
218+
index 7d27825..998e51d 100644
219219
--- a/tests/fixed/example-class.php
220220
+++ b/tests/fixed/example-class.php
221-
@@ -25,16 +25,19 @@ class Example implements IteratorAggregate
221+
@@ -25,17 +25,30 @@ class Example implements IteratorAggregate
222222
{
223223
private const VERSION = PHP_VERSION - (PHP_MINOR_VERSION * 100) - PHP_PATCH_VERSION;
224224

225-
- private int|null $foo = null;
225+
- private ControlStructureSniff|int|string|null $baxBax = null;
226226
+ /** @var int|null */
227227
+ private $foo;
228228

229-
/** @var string[] */
230-
- private array $bar;
229+
- public function __construct(private int|null $foo = null, private array $bar = [], private bool $baz = false, $baxBax = 'unused')
230+
+ /** @var string[] */
231231
+ private $bar;
232-
233-
- private bool $baz;
232+
+
234233
+ /** @var bool */
235234
+ private $baz;
236-
237-
- private ControlStructureSniff|int|string|null $baxBax = null;
235+
+
238236
+ /** @var ControlStructureSniff|int|string|null */
239237
+ private $baxBax;
240-
241-
- public function __construct(int|null $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
238+
+
242239
+ public function __construct(?int $foo = null, array $bar = [], bool $baz = false, $baxBax = 'unused')
243240
{
244-
$this->foo = $foo;
245-
$this->bar = $bar;
246-
@@ -45,7 +48,7 @@ class Example implements IteratorAggregate
241+
+ $this->foo = $foo;
242+
+ $this->bar = $bar;
243+
+ $this->baz = $baz;
244+
$this->baxBax = $baxBax;
245+
}
246+
247247
/**
248248
* Description
249249
*/
@@ -256,7 +256,7 @@ diff --git a/tests/fixed/namespaces-spacing.php b/tests/fixed/namespaces-spacing
256256
index 36cbae2..d42bbfe 100644
257257
--- a/tests/fixed/namespaces-spacing.php
258258
+++ b/tests/fixed/namespaces-spacing.php
259-
@@ -16,5 +16,5 @@ use const DATE_RFC3339;
259+
@@ -16,5 +16,5 @@
260260
strrev(
261261
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
262262
->sub(new DateInterval('P1D'))
@@ -267,7 +267,7 @@ diff --git a/tests/fixed/new_with_parentheses.php b/tests/fixed/new_with_parenth
267267
index 47a06ec..6e81bbe 100644
268268
--- a/tests/fixed/new_with_parentheses.php
269269
+++ b/tests/fixed/new_with_parentheses.php
270-
@@ -24,5 +24,5 @@ $y = [new stdClass()];
270+
@@ -24,5 +24,5 @@
271271

272272
$z = new stdClass() ? new stdClass() : new stdClass();
273273

@@ -301,7 +301,7 @@ diff --git a/tests/fixed/null_coalesce_operator.php b/tests/fixed/null_coalesce_
301301
index 51c361c..8846dd1 100644
302302
--- a/tests/fixed/null_coalesce_operator.php
303303
+++ b/tests/fixed/null_coalesce_operator.php
304-
@@ -4,7 +4,7 @@ declare(strict_types=1);
304+
@@ -4,7 +4,7 @@
305305

306306
$foo = $_GET['foo'] ?? 'foo';
307307

@@ -372,7 +372,7 @@ diff --git a/tests/fixed/return_type_on_methods.php b/tests/fixed/return_type_on
372372
index 0c897ae..8e2c6f7 100644
373373
--- a/tests/fixed/return_type_on_methods.php
374374
+++ b/tests/fixed/return_type_on_methods.php
375-
@@ -31,7 +31,7 @@ class Test
375+
@@ -31,7 +31,7 @@ public function f(
376376
int $c,
377377
int $d,
378378
int $e,
@@ -381,7 +381,7 @@ index 0c897ae..8e2c6f7 100644
381381
): void {
382382
}
383383

384-
@@ -40,7 +40,7 @@ class Test
384+
@@ -40,7 +40,7 @@ public function g(
385385
int $c,
386386
int $d,
387387
int $e,
@@ -390,7 +390,7 @@ index 0c897ae..8e2c6f7 100644
390390
): void {
391391
}
392392

393-
@@ -49,7 +49,7 @@ class Test
393+
@@ -49,7 +49,7 @@ public function h(
394394
int $c,
395395
int $d,
396396
int $e,
@@ -399,7 +399,7 @@ index 0c897ae..8e2c6f7 100644
399399
): void {
400400
}
401401

402-
@@ -58,7 +58,7 @@ class Test
402+
@@ -58,7 +58,7 @@ public function i(
403403
int $c,
404404
int $d,
405405
int $e,
@@ -408,7 +408,7 @@ index 0c897ae..8e2c6f7 100644
408408
): void {
409409
}
410410

411-
@@ -67,7 +67,7 @@ class Test
411+
@@ -67,7 +67,7 @@ public function j(
412412
int $c,
413413
int $d,
414414
int $e,
@@ -421,7 +421,7 @@ diff --git a/tests/fixed/type-hints.php b/tests/fixed/type-hints.php
421421
index 5e26ed8..10e6f34 100644
422422
--- a/tests/fixed/type-hints.php
423423
+++ b/tests/fixed/type-hints.php
424-
@@ -10,7 +10,7 @@ use Traversable;
424+
@@ -10,7 +10,7 @@
425425
class TraversableTypeHints
426426
{
427427
/** @var Traversable */
@@ -430,7 +430,7 @@ index 5e26ed8..10e6f34 100644
430430

431431
/**
432432
* @param Iterator $iterator
433-
@@ -25,5 +25,6 @@ class TraversableTypeHints
433+
@@ -25,5 +25,6 @@ public function get(Iterator $iterator): Traversable
434434

435435
class UnionTypeHints
436436
{
@@ -442,7 +442,7 @@ diff --git a/tests/input/ControlStructures.php b/tests/input/ControlStructures.p
442442
index 73944e3..a0e0b2e 100644
443443
--- a/tests/input/ControlStructures.php
444444
+++ b/tests/input/ControlStructures.php
445-
@@ -93,7 +93,7 @@ class ControlStructures
445+
@@ -93,7 +93,7 @@ public function spaceBelowBlocks(): void
446446
}
447447
try {
448448
echo 4;
@@ -497,7 +497,7 @@ diff --git a/tests/input/TrailingCommaOnFunctions.php b/tests/input/TrailingComm
497497
index fc5480e..f3ffa91 100644
498498
--- a/tests/input/TrailingCommaOnFunctions.php
499499
+++ b/tests/input/TrailingCommaOnFunctions.php
500-
@@ -10,7 +10,7 @@ use function var_dump;
500+
@@ -10,7 +10,7 @@
501501

502502
class TrailingCommaOnFunctions
503503
{
@@ -506,7 +506,7 @@ index fc5480e..f3ffa91 100644
506506
{
507507
}
508508

509-
@@ -23,7 +23,7 @@ class TrailingCommaOnFunctions
509+
@@ -23,7 +23,7 @@ public function uses(): void
510510
{
511511
$var = null;
512512

@@ -515,7 +515,7 @@ index fc5480e..f3ffa91 100644
515515
var_dump($var);
516516
};
517517

518-
@@ -37,8 +37,7 @@ class TrailingCommaOnFunctions
518+
@@ -37,8 +37,7 @@ public function uses(): void
519519

520520
$class = new TrailingCommaOnFunctions();
521521

@@ -529,7 +529,7 @@ diff --git a/tests/input/arrow-functions-format.php b/tests/input/arrow-function
529529
index d3903ff..8a358e8 100644
530530
--- a/tests/input/arrow-functions-format.php
531531
+++ b/tests/input/arrow-functions-format.php
532-
@@ -18,10 +18,10 @@ $returningObject = static fn () => new stdClass();
532+
@@ -18,10 +18,10 @@
533533

534534
$multiLineArrowFunctions = Collection::from([1, 2])
535535
->map(
@@ -546,7 +546,7 @@ diff --git a/tests/input/namespaces-spacing.php b/tests/input/namespaces-spacing
546546
index e7be018..e1ab639 100644
547547
--- a/tests/input/namespaces-spacing.php
548548
+++ b/tests/input/namespaces-spacing.php
549-
@@ -11,5 +11,5 @@ use const DATE_RFC3339;
549+
@@ -11,5 +11,5 @@
550550
strrev(
551551
(new DateTimeImmutable('@' . time(), new DateTimeZone('UTC')))
552552
->sub(new DateInterval('P1D'))

0 commit comments

Comments
 (0)