Skip to content

Commit 7204b49

Browse files
committed
Upgrade to PHP 8.1
- Forbids the 'global' keyword. - Bumps Doctrine coding standard to 11.1. Signed-off-by: Maurício Meneghini Fauth <[email protected]>
1 parent 850a883 commit 7204b49

File tree

3 files changed

+4
-28
lines changed

3 files changed

+4
-28
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1"]
16+
php-version: ["8.1", "8.2"]
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Install xmllint

PhpMyAdmin/ruleset.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
<!-- Do not require multiple assignment alignment -->
88
<exclude name="Generic.Formatting.MultipleStatementAlignment"/>
99

10-
<!-- Allow the 'global' keyword -->
11-
<exclude name="Squiz.PHP.GlobalKeyword"/>
12-
1310
<!-- Disable the superfluous class naming rules -->
1411
<exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
1512
<exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
@@ -19,25 +16,4 @@
1916
<!-- Do not replace /* @var type $foo */ and similar simple inline annotations with assert() -->
2017
<exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
2118
</rule>
22-
23-
<!-- Disable modern class name reference on objects (PHP 8.0+) -->
24-
<rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference">
25-
<properties>
26-
<property name="enableOnObjects" value="false"/>
27-
</properties>
28-
</rule>
29-
30-
<!-- Do not require usage of null coalesce operator equal operator (PHP 7.4+) -->
31-
<rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator">
32-
<properties>
33-
<property name="enable" value="false"/>
34-
</properties>
35-
</rule>
36-
37-
<!-- Disable native type hints for properties (PHP 7.4+) -->
38-
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
39-
<properties>
40-
<property name="enableNativeTypeHint" value="false"/>
41-
</properties>
42-
</rule>
4319
</ruleset>

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"issues": "https://github.com/phpmyadmin/coding-standard/issues"
1717
},
1818
"require": {
19-
"php": "^7.1 || ^8.0",
20-
"doctrine/coding-standard": "^9.0.0",
21-
"squizlabs/php_codesniffer": "^3.6.0"
19+
"php": "^8.1",
20+
"doctrine/coding-standard": "^11.1",
21+
"squizlabs/php_codesniffer": "^3.7"
2222
},
2323
"config": {
2424
"sort-packages": true,

0 commit comments

Comments
 (0)