remove nette/utils, if not needed (#149)

* remove nette/utils, if not needed

* misc

* fix rector rule test

Author: TomasVotruba

build/target-repository/.github/workflows/standalone_install.yaml

@@ -9,7 +9,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php_version: ['7.4', '8.0']
+                php_version: ['7.4', '8.0', '8.3']
 
         steps:
             # prepare empty composer.json that allows the phpstan extension plugin

build/target-repository/composer.json

@@ -5,8 +5,8 @@
     "license": "MIT",
     "require": {
         "php": "^7.4|^8.0",
-        "nette/utils": "^3.2.9 || ^4.0",
         "phpstan/phpstan": "^2.0",
+        "nette/utils": "^3.2|^4.0",
         "webmozart/assert": "^1.11"
     },
     "autoload": {

composer-dependency-analyser.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+use ShipMonk\ComposerDependencyAnalyser\Config\ErrorType;
+
+return (new Configuration())->addPathToScan(__DIR__ . '/src', false)
+    ->addPathToExclude(__DIR__ . '/tests/Rules/Rector/NoInstanceOfStaticReflectionRule/Fixture')
+    ->addPathToExclude(__DIR__ . '/tests/Rules/Enum/RequireUniqueEnumConstantRule/Fixture')
+    ->addPathToExclude(__DIR__ . '/tests/Rules/NoReturnArrayVariableListRule/Fixture')
+    ->addPathToExclude(__DIR__ . '/tests/Rules/ForbiddenExtendOfNonAbstractClassRule/Fixture')
+    ->addPathToExclude(__DIR__ . '/tests/Rules/PHPUnit/NoTestMocksRule/Fixture')
+
+    // already in phpstan/phpstan
+    ->ignoreErrorsOnPackage('nikic/php-parser', [ErrorType::DEV_DEPENDENCY_IN_PROD])
+
+    // rule that runs on Rector rule only
+    ->ignoreErrorsOnPackage('rector/rector', [ErrorType::DEV_DEPENDENCY_IN_PROD])
+
+    ->ignoreErrorsOnExtension('ext-ctype', [ErrorType::SHADOW_DEPENDENCY])
+    ->ignoreErrorsOnExtension('ext-simplexml', [ErrorType::SHADOW_DEPENDENCY]);
+
+// ->ignoreErrorsOnPath('/Fixture/', [\ShipMonk\ComposerDependencyAnalyser\Config\ErrorType::UNKNOWN_CLASS]);

composer.json

@@ -5,19 +5,23 @@
     "license": "MIT",
     "require": {
         "php": ">=8.2",
-        "nette/utils": "^4.0",
         "webmozart/assert": "^1.11",
-        "phpstan/phpstan": "^2.0"
+        "phpstan/phpstan": "^2.0",
+        "nette/utils": "^3.2|^4.0",
+        "phpstan/phpdoc-parser": "^2.0"
     },
     "require-dev": {
         "nikic/php-parser": "^5.3",
         "phpunit/phpunit": "^11.5",
         "symfony/framework-bundle": "6.1.*",
         "symplify/easy-coding-standard": "^12.5",
-        "tomasvotruba/class-leak": "^1.2",
+        "tomasvotruba/class-leak": "^2.0",
         "rector/rector": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "symplify/phpstan-extensions": "^12.0"
+        "symplify/phpstan-extensions": "^12.0",
+        "tomasvotruba/unused-public": "^2.0",
+        "tomasvotruba/type-coverage": "^2.0",
+        "shipmonk/composer-dependency-analyser": "^1.8"
     },
     "autoload": {
         "psr-4": {
@@ -30,17 +34,8 @@
         },
         "classmap": [
             "stubs"
-        ],
-        "files": [
         ]
     },
-    "extra": {
-        "phpstan": {
-            "includes": [
-                "config/services/services.neon"
-            ]
-        }
-    },
     "config": {
         "platform-check": false,
         "allow-plugins": {
@@ -52,5 +47,12 @@
         "fix-cs": "vendor/bin/ecs check --fix --ansi",
         "phpstan": "vendor/bin/phpstan analyse --ansi",
         "rector": "vendor/bin/rector process --dry-run --ansi"
+    },
+    "extra": {
+        "phpstan": {
+            "includes": [
+                "config/services/services.neon"
+            ]
+        }
     }
 }

phpstan.neon

@@ -23,22 +23,20 @@ parameters:
         - */Fixture/*
 
     # https://github.com/TomasVotruba/unused-public
-    # unused_public:
-    #     methods: true
-    #     properties: true
-    #     constants: true
+    unused_public:
+        methods: true
+        properties: true
+        constants: true
 
-    # type_coverage:
-    #     return: 99
-    #     param: 99
-    #     property: 99
+    type_coverage:
+        return: 99
+        param: 99
+        property: 99
 
     ignoreErrors:
         # needless generics
         - '#Class Symplify\\PHPStanRules\\(.*?)Rule implements generic interface PHPStan\\Rules\\Rule but does not specify its types\: TNodeType#'
 
-        - '#Class PHP_CodeSniffer\\Sniffs\\Sniff not found#'
-
         - '#Method Symplify\\PHPStanRules\\Reflection\\ReflectionParser\:\:parseNativeClassReflection\(\) has parameter \$reflectionClass with generic class ReflectionClass but does not specify its types\: T#'
 
         # overly detailed
@@ -54,10 +52,6 @@ parameters:
         # useful to have IDE know the types
         - identifier: phpstanApi.instanceofType
 
-        -
-            identifier: class.notFound
-            path: tests/Rules/Rector/PhpUpgradeImplementsMinPhpVersionInterfaceRule/PhpUpgradeImplementsMinPhpVersionInterfaceRuleTest.php
-
         # overly detailed
         -
             message: '#Parameter \#2 \$expectedErrors of method PHPStan\\Testing\\RuleTestCase<(.*?)>::analyse\(\) expects list<array\{0: string, 1: int, 2\?: string\|null\}>, (.*?) given#'
@@ -70,3 +64,6 @@ parameters:
 
         # handle next
         - '#Method Symplify\\PHPStanRules\\Rules\\AbstractSymplifyRule\:\:processNode\(\) should return list<PHPStan\\Rules\\IdentifierRuleError> but returns array<PHPStan\\Rules\\RuleError\|string>#'
+
+        # used in tests
+        - '#Public constant "Symplify\\PHPStanRules\\(.*?)Rule\:\:ERROR_MESSAGE" is never used#'

phpunit.xml

@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    bootstrap="tests/autoload.php"
+    colors="true"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    displayDetailsOnIncompleteTests="true"
+    cacheDirectory=".phpunit.cache"
+>
     <testsuite name="all">
         <directory>tests</directory>
         <exclude>tests/Rules/ClassNameRespectsParentSuffixRule/Fixture/</exclude>

phpunit.xml.bak

@@ -32,6 +32,11 @@
     $rectorConfig->skip([
         '*/Source/*',
         '*/Fixture/*',
+
+        \Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class => [
+            __DIR__ . '/tests/Naming/ClassToSuffixResolverTest.php',
+            __DIR__ . '/tests/Rules/Rector/PhpUpgradeImplementsMinPhpVersionInterfaceRule/PhpUpgradeImplementsMinPhpVersionInterfaceRuleTest.php',
+        ],
     ]);
 
     $rectorConfig->ruleWithConfiguration(\Rector\Php55\Rector\String_\StringClassNameToClassConstantRector::class, [

rector.php

@@ -4,8 +4,7 @@
 
 namespace Symplify\PHPStanRules\Composer;
 
-use Nette\Utils\FileSystem;
-use Nette\Utils\Json;
+use Symplify\PHPStanRules\FileSystem\FileSystem;
 
 final class ComposerAutoloadResolver
 {
@@ -24,7 +23,7 @@ public function getPsr4Autoload(): array
         }
 
         $fileContent = FileSystem::read(self::COMPOSER_JSON_FILE);
-        $composerJsonContent = Json::decode($fileContent, Json::FORCE_ARRAY);
+        $composerJsonContent = json_decode($fileContent, true, 512, JSON_THROW_ON_ERROR);
 
         $autoloadPsr4 = $composerJsonContent['autoload']['psr-4'] ?? [];
         $autoloadDevPsr4 = $composerJsonContent['autoload-dev']['psr-4'] ?? [];

src/Composer/ComposerAutoloadResolver.php

@@ -30,7 +30,7 @@ public function isClassNamespaceCorrect(
 
         // @todo put into value object
         $namespaceSuffixByNamespaceBeforeClass = rtrim(
-            Strings::substring(
+            substr(
                 $classNamespaceAndDirectory->getNamespaceBeforeClass(),
                 strlen($classNamespaceAndDirectory->getNamespace())
             ),