Drop support for PHP < 8.1

.github/workflows/checks.yml

@@ -34,7 +34,7 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ ubuntu-latest, windows-latest ]
-                php-version: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5' ]
+                php-version: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
                 dependency-version: [ prefer-lowest, prefer-stable ]
         steps:
             -
@@ -47,9 +47,7 @@ jobs:
                     php-version: ${{ matrix.php-version }}
             -
                 name: Update dependencies
-                run: |
-                    composer remove --dev shipmonk/coverage-guard --no-update
-                    composer update --no-progress --${{ matrix.dependency-version }} --prefer-dist --no-interaction
+                run: composer update --no-progress --${{ matrix.dependency-version }} --prefer-dist --no-interaction
             -
                 name: Run tests
                 run: composer check:tests

composer.json

@@ -10,7 +10,7 @@
         "static analysis"
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "phpstan/phpstan": "^2.1.33"
     },
     "require-dev": {

phpcs.xml.dist

@@ -11,16 +11,10 @@
 
     <exclude-pattern>tests/*/data/*</exclude-pattern>
 
-    <config name="php_version" value="70400"/>
+    <config name="php_version" value="80100"/>
     <config name="installed_paths" value="vendor/slevomat/coding-standard,vendor/shipmonk/coding-standard"/>
 
     <rule ref="ShipMonkCodingStandard">
         <exclude name="SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden"/><!-- It removes @dataProvider, but PHPUnit 9 does not yet have #[DataProvider] -->
     </rule>
-
-    <rule ref="SlevomatCodingStandard.Functions.DisallowTrailingCommaInDeclaration">
-        <properties>
-            <property name="onlySingleLine" value="false"/>
-        </properties>
-    </rule>
 </ruleset>

phpstan.neon.dist

@@ -10,7 +10,7 @@ includes:
 
 parameters:
     phpVersion:
-        min: 70400
+        min: 80100
         max: 80599
     internalErrorsCountLimit: 1
     paths:
@@ -45,20 +45,8 @@ parameters:
                 PHPStan\Rules\Rule: Rule
                 PhpParser\NodeVisitor: Visitor
                 ShipMonk\PHPStan\RuleTestCase: RuleTest
-        enforceClosureParamNativeTypehint:
-            enabled: false # we support even PHP 7.4, some typehints cannot be used
 
     ignoreErrors:
-        -
-            message: "#Class BackedEnum not found\\.#"
-            path: src/Rule/BackedEnumGenericsRule.php
-            reportUnmatched: false # fails only for PHP < 8 https://github.com/phpstan/phpstan/issues/6290
-
-        -
-            message: "#Call to method PHPStan\\\\Reflection\\\\ClassReflection::isEnum\\(\\) will always evaluate to false\\.#"
-            path: src/Rule/ForbidProtectedEnumMethodRule.php
-            reportUnmatched: false # fails only for PHP < 8 https://github.com/phpstan/phpstan-src/pull/3925/files#diff-df58b1c8117cfa9b77453fb2cc8fdeeb0803ad0acfd2dec85a441a8fa5a53c06R24
-
         -
             message: "#but it's missing from the PHPDoc @throws tag\\.$#" # allow uncatched exceptions in tests
             path: tests/*

src/Rule/AllowComparingOnlyComparableTypesRule.php

@@ -41,7 +41,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (
@@ -109,7 +109,7 @@ private function isComparable(Type $type): bool
 
     private function isComparableTogether(
         Type $leftType,
-        Type $rightType
+        Type $rightType,
     ): bool
     {
         $intType = new IntegerType();
@@ -150,7 +150,7 @@ private function isComparableTogether(
                     }
 
                     for ($i = 0; $i < count($leftValueTypes); $i++) {
-                        if (!$this->isComparableTogether($leftValueTypes[$i], $rightValueTypes[$i])) { // @phpstan-ignore offsetAccess.notFound
+                        if (!$this->isComparableTogether($leftValueTypes[$i], $rightValueTypes[$i])) { // @phpstan-ignore offsetAccess.notFound, offsetAccess.notFound
                             return false;
                         }
                     }
@@ -168,7 +168,7 @@ private function isComparableTogether(
      */
     private function containsOnlyTypes(
         Type $checkedType,
-        array $allowedTypes
+        array $allowedTypes,
     ): bool
     {
         $allowedType = TypeCombinator::union(...$allowedTypes);

src/Rule/BackedEnumGenericsRule.php

@@ -29,7 +29,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         $classReflection = $node->getClassReflection();
@@ -60,7 +60,7 @@ public function processNode(
 
     private function hasGenericsTag(
         ClassReflection $classReflection,
-        string $expectedTag
+        string $expectedTag,
     ): bool
     {
         if ($classReflection->isBackedEnum()) {

src/Rule/ClassSuffixNamingRule.php

@@ -10,34 +10,24 @@
 use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use function strlen;
-use function substr_compare;
+use function str_ends_with;
 
 /**
  * @implements Rule<InClassNode>
  */
 class ClassSuffixNamingRule implements Rule
 {
 
-    private ReflectionProvider $reflectionProvider;
-
-    /**
-     * @var array<class-string, string>
-     */
-    private array $superclassToSuffixMapping;
-
     private bool $validated = false;
 
     /**
      * @param array<class-string, string> $superclassToSuffixMapping
      */
     public function __construct(
-        ReflectionProvider $reflectionProvider,
-        array $superclassToSuffixMapping = []
+        private readonly ReflectionProvider $reflectionProvider,
+        private readonly array $superclassToSuffixMapping = [],
     )
     {
-        $this->reflectionProvider = $reflectionProvider;
-        $this->superclassToSuffixMapping = $superclassToSuffixMapping;
     }
 
     private function validateSuperclassToSuffixMapping(): void
@@ -65,7 +55,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         $this->validateSuperclassToSuffixMapping();
@@ -92,7 +82,7 @@ public function processNode(
 
             $className = $classReflection->getName();
 
-            if (substr_compare($className, $suffix, -strlen($suffix)) !== 0) {
+            if (!str_ends_with($className, $suffix)) {
                 $error = RuleErrorBuilder::message("Class name $className should end with $suffix suffix")
                     ->identifier('shipmonk.invalidClassSuffix')
                     ->build();

src/Rule/EnforceClosureParamNativeTypehintRule.php

@@ -20,17 +20,11 @@
 class EnforceClosureParamNativeTypehintRule implements Rule
 {
 
-    private PhpVersion $phpVersion;
-
-    private bool $allowMissingTypeWhenInferred;
-
     public function __construct(
-        PhpVersion $phpVersion,
-        bool $allowMissingTypeWhenInferred
+        private readonly PhpVersion $phpVersion,
+        private readonly bool $allowMissingTypeWhenInferred,
     )
     {
-        $this->phpVersion = $phpVersion;
-        $this->allowMissingTypeWhenInferred = $allowMissingTypeWhenInferred;
     }
 
     public function getNodeType(): string
@@ -43,7 +37,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (!$node instanceof InClosureNode && !$node instanceof InArrowFunctionNode) {

src/Rule/EnforceEnumMatchRule.php

@@ -34,7 +34,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (!$node instanceof Identical && !$node instanceof NotIdentical) {

src/Rule/EnforceIteratorToArrayPreserveKeysRule.php

@@ -29,7 +29,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (!$node->name instanceof Name) {

src/Rule/EnforceListReturnRule.php

@@ -30,7 +30,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         $methodReflection = $scope->getFunction();

src/Rule/EnforceNativeReturnTypehintRule.php

@@ -42,21 +42,12 @@
 class EnforceNativeReturnTypehintRule implements Rule
 {
 
-    private FileTypeMapper $fileTypeMapper;
-
-    private PhpVersion $phpVersion;
-
-    private bool $treatPhpDocTypesAsCertain;
-
     public function __construct(
-        FileTypeMapper $fileTypeMapper,
-        PhpVersion $phpVersion,
-        bool $treatPhpDocTypesAsCertain
+        private readonly FileTypeMapper $fileTypeMapper,
+        private readonly PhpVersion $phpVersion,
+        private readonly bool $treatPhpDocTypesAsCertain,
     )
     {
-        $this->fileTypeMapper = $fileTypeMapper;
-        $this->phpVersion = $phpVersion;
-        $this->treatPhpDocTypesAsCertain = $treatPhpDocTypesAsCertain;
     }
 
     public function getNodeType(): string
@@ -70,7 +61,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if ($this->treatPhpDocTypesAsCertain === false) {
@@ -114,7 +105,7 @@ private function getTypehintByType(
         Scope $scope,
         bool $typeFromPhpDoc,
         bool $alwaysThrowsException,
-        bool $topLevel
+        bool $topLevel,
     ): ?string
     {
         if ($type instanceof MixedType || $this->isUnionTypeWithMixed($type)) {
@@ -212,7 +203,7 @@ private function getTypeOfReturnStatements(ReturnStatementsNode $node): Type
 
     private function getPhpDocReturnType(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): ?Type
     {
         $docComment = $node->getDocComment();
@@ -251,7 +242,7 @@ private function getUnionTypehint(
         Type $type,
         Scope $scope,
         bool $typeFromPhpDoc,
-        bool $alwaysThrowsException
+        bool $alwaysThrowsException,
     ): ?string
     {
         if (!$type instanceof UnionType) {
@@ -295,7 +286,7 @@ private function getIntersectionTypehint(
         Type $type,
         Scope $scope,
         bool $typeFromPhpDoc,
-        bool $alwaysThrowsException
+        bool $alwaysThrowsException,
     ): ?string
     {
         if (!$type instanceof IntersectionType) { // @phpstan-ignore phpstanApi.instanceofType

src/Rule/EnforceReadonlyPublicPropertyRule.php

@@ -16,17 +16,11 @@
 class EnforceReadonlyPublicPropertyRule implements Rule
 {
 
-    private bool $excludePropertyWithDefaultValue;
-
-    private PhpVersion $phpVersion;
-
     public function __construct(
-        bool $excludePropertyWithDefaultValue,
-        PhpVersion $phpVersion
+        private readonly bool $excludePropertyWithDefaultValue,
+        private readonly PhpVersion $phpVersion,
     )
     {
-        $this->excludePropertyWithDefaultValue = $excludePropertyWithDefaultValue;
-        $this->phpVersion = $phpVersion;
     }
 
     public function getNodeType(): string
@@ -40,7 +34,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (!$this->phpVersion->supportsReadOnlyProperties()) {

src/Rule/ForbidArithmeticOperationOnNonNumberRule.php

@@ -31,11 +31,8 @@
 class ForbidArithmeticOperationOnNonNumberRule implements Rule
 {
 
-    private bool $allowNumericString;
-
-    public function __construct(bool $allowNumericString)
+    public function __construct(private readonly bool $allowNumericString)
     {
-        $this->allowNumericString = $allowNumericString;
     }
 
     public function getNodeType(): string
@@ -48,7 +45,7 @@ public function getNodeType(): string
      */
     public function processNode(
         Node $node,
-        Scope $scope
+        Scope $scope,
     ): array
     {
         if (
@@ -78,7 +75,7 @@ public function processNode(
     private function processUnary(
         Expr $expr,
         Scope $scope,
-        string $operator
+        string $operator,
     ): array
     {
         $exprType = $scope->getType($expr);
@@ -105,7 +102,7 @@ private function processBinary(
         Expr $left,
         Expr $right,
         Scope $scope,
-        string $operator
+        string $operator,
     ): array
     {
         $leftType = $scope->getType($left);
@@ -154,7 +151,7 @@ private function buildBinaryErrors(
         string $operator,
         string $type,
         Type $leftType,
-        Type $rightType
+        Type $rightType,
     ): array
     {
         $errorMessage = sprintf(