Skip to content

Commit 457d390

Browse files
committed
removed presets for PHP 7.x
1 parent cae7f9d commit 457d390

File tree

10 files changed

+30
-92
lines changed

10 files changed

+30
-92
lines changed

preset-fixer/php71.php

Lines changed: 0 additions & 19 deletions
This file was deleted.

preset-fixer/php72.php

Lines changed: 0 additions & 5 deletions
This file was deleted.

preset-fixer/php73.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

preset-fixer/php74.php

Lines changed: 0 additions & 12 deletions
This file was deleted.

preset-fixer/php80.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
declare(strict_types=1);
44

5-
$config = require __DIR__ . '/php74.php';
5+
$config = require __DIR__ . '/base.php';
6+
7+
foreach (glob(__DIR__ . '/common/*.php') as $file) {
8+
$config->setRules(array_merge($config->getRules(), require $file));
9+
}
610

711
$rules = [
8-
'@PHP80Migration' => true,
9-
'@PHP80Migration:risky' => true,
1012
'void_return' => false,
1113
];
1214

13-
$config->setRules($rules + $config->getRules());
15+
$config->setRules(array_merge($rules, $config->getRules(), $customRules));
1416
return $config;

preset-sniffer/php71.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

preset-sniffer/php72.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

preset-sniffer/php73.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

preset-sniffer/php74.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

preset-sniffer/php80.xml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
<?xml version="1.0"?>
22
<ruleset name="PHP 8.0" namespace="Nette">
3-
<rule ref="./php74.xml"/>
3+
<rule ref="./Nette.xml"/>
4+
5+
<!-- Enforces consistent formatting of return typehints: function foo(): ?int -->
6+
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
7+
8+
<!-- Requires use of null coalesce operator when possible -->
9+
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceOperator"/>
10+
11+
<!-- enforces trailing commas in multi-line calls -->
12+
<rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
13+
14+
<!-- Requires use of null coalesce equal operator when possible -->
15+
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
16+
17+
<!-- Requires arrow functions -->
18+
<rule ref="SlevomatCodingStandard.Functions.RequireArrowFunction"/>
19+
20+
<!-- Requires use of numeric literal separators. -->
21+
<rule ref="SlevomatCodingStandard.Numbers.RequireNumericLiteralSeparator">
22+
<properties>
23+
<property name="minDigitsBeforeDecimalPoint" value="7"/>
24+
<property name="minDigitsAfterDecimalPoint" value="20"/>
25+
</properties>
26+
</rule>
427

528
<!-- Class names should be referenced via ::class constant when possible -->
629
<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference">

0 commit comments

Comments
 (0)