Skip to content

Commit 2c6423f

Browse files
Merge pull request #127 from sascha-egerer/feature/drop-php-7-support
Drop support for < PHP 7.4 and update dev dependencies
2 parents 6785a0f + 82b7134 commit 2c6423f

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

.github/workflows/tests.yml

-12
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
include:
15-
- typo3-version: "^10.4"
16-
php-version: "7.2"
17-
composer-flags: ""
18-
- typo3-version: "^10.4"
19-
php-version: "7.2"
20-
composer-flags: " --prefer-lowest"
21-
- typo3-version: "^10.4"
22-
php-version: "7.3"
23-
composer-flags: ""
24-
- typo3-version: "^10.4"
25-
php-version: "7.3"
26-
composer-flags: " --prefer-lowest"
2715
- typo3-version: "^10.4"
2816
php-version: "7.4"
2917
composer-flags: ""

build.xml

+3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
passthru="true"
3838
checkreturn="true"
3939
>
40+
<arg line="--runtime-set php_version 70400"/>
4041
</exec>
4142
</target>
4243

@@ -46,7 +47,9 @@
4647
logoutput="true"
4748
passthru="true"
4849
checkreturn="true"
50+
level="error"
4951
>
52+
<arg line="--runtime-set php_version 70400"/>
5053
</exec>
5154
</target>
5255

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"minimum-stability": "dev",
99
"prefer-stable": true,
1010
"require": {
11-
"php": "^7.2 || ^8.0",
11+
"php": "^7.4 || ^8.0",
1212
"phpstan/phpstan": "^1.8.9",
1313
"nikic/php-parser": "^4.15.1",
14-
"typo3/cms-core": "^10.4 || ^11.5 || ^12.3",
15-
"typo3/cms-extbase": "^10.4 || ^11.5 || ^12.3",
14+
"typo3/cms-core": "^10.4 || ^11.5 || ^12.4",
15+
"typo3/cms-extbase": "^10.4 || ^11.5 || ^12.4",
1616
"bnf/phpstan-psr-container": "^1.0",
1717
"composer/semver": "^3.3"
1818
},
1919
"require-dev": {
20-
"consistence-community/coding-standard": "^3.10.1",
21-
"slevomat/coding-standard": "^6.4.1",
20+
"consistence-community/coding-standard": "^3.11.1",
21+
"slevomat/coding-standard": "^7.2.1",
2222
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
2323
"php-parallel-lint/php-parallel-lint": "^1.3.2",
2424
"phing/phing": "^2.17.4",

phpcs.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<rule ref="vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
1212
<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
1313
<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable"/>
14-
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
1514
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
1615
<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
1716
<exclude name="Consistence.Exceptions.ExceptionDeclaration"/>
@@ -26,7 +25,8 @@
2625
</rule>
2726
<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
2827
<properties>
29-
<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
28+
<property name="declareOnFirstLine" value="true"/>
29+
<property name="linesCountAfterDeclare" value="1"/>
3030
</properties>
3131
</rule>
3232
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">

0 commit comments

Comments
 (0)