[deprecation] Remove deprecated PublicConstantVisibilityRector, clean…

…up deprecated SetListInterface (rectorphp#6424) * [deprecation] Remove deprecated PublicConstantVisibilityRector * remove deprecated SystemError->getFile() * cleanup * cleanup deprecated SetListInterface * bump dev deps * [ci] skip deprecated set list interface
carlos-granados · Nov 12, 2024 · c23ba82 · c23ba82
1 parent 5baf487
commit c23ba82
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 194 deletions.
diff --git a/.github/workflows/code_analysis.yaml b/.github/workflows/code_analysis.yaml
@@ -40,7 +40,7 @@ jobs:
                     -
                         name: 'Active Classes'
                         run: |
-                            vendor/bin/class-leak check bin config src rules utils --skip-suffix "Rector" --skip-type="Rector\\Utils\\Compiler\\Unprefixer" --skip-type="Rector\\PhpDocParser\\PhpParser\\SmartPhpParserFactory" --skip-type="Rector\\NodeCollector\\BinaryOpConditionsCollector"
+                            vendor/bin/class-leak check bin config src rules utils --skip-suffix "Rector" --skip-type="Rector\\Utils\\Compiler\\Unprefixer" --skip-type="Rector\\PhpDocParser\\PhpParser\\SmartPhpParserFactory" --skip-type="Rector\\NodeCollector\\BinaryOpConditionsCollector" --skip-type="Rector\\Set\\Contract\\SetListInterface"
 
                     -
                         name: 'Compatible PHPStan versions'

diff --git a/composer.json b/composer.json
@@ -51,15 +51,15 @@
         "phpunit/phpunit": "^10.5",
         "rector/release-notes-generator": "^0.3.0",
         "rector/swiss-knife": "^0.2.16",
-        "rector/type-perfect": "^0.1.6",
+        "rector/type-perfect": "^1.0",
         "shipmonk/composer-dependency-analyser": "^1.7",
         "symplify/easy-coding-standard": "^12.3",
         "symplify/phpstan-extensions": "^11.4",
         "symplify/phpstan-rules": "^13.0",
         "symplify/rule-doc-generator": "^12.2.5",
         "symplify/vendor-patches": "^11.3",
-        "tomasvotruba/class-leak": "^0.2.15",
-        "tomasvotruba/unused-public": "^0.3.10",
+        "tomasvotruba/class-leak": "^1.1.2",
+        "tomasvotruba/unused-public": "^1.0",
         "tracy/tracy": "^2.9"
     },
     "replace": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -289,21 +289,9 @@ parameters:
             message: '#Parameters should have "PhpParser\\Node\\Expr\\Closure" types as the only types passed to this method#'
         -
             message: '#Parameters should have "PhpParser\\Node\\Stmt\\ClassMethod" types as the only types passed to this method#'
-            path: src/VendorLocker/ParentClassMethodTypeOverrideGuard.php
-
-        # deprecated
-        - '#Register "Rector\\Php71\\Rector\\ClassConst\\PublicConstantVisibilityRector" service to "php71\.php" config set#'
-        - '#Public method "Rector\\ValueObject\\Error\\SystemError\:\:getFile\(\)" is never used#'
-
-        # soon to be used
-        - '#Property Rector\\Configuration\\RectorConfigBuilder\:\:\$isWithPhpSetsUsed is never read, only written#'
-
-        # used once
-        - '#Interface "Rector\\Configuration\\Deprecation\\Contract\\DeprecatedInterface" has only single implementer\. Consider using the class directly as there is no point in using the interface#'
-
-        # rector internal deprecation
-        - '#Class Rector\\Set\\ValueObject\\(Level)?SetList implements deprecated interface#'
-        - '#Fetching class constant class of deprecated class Rector#'
+            paths:
+                 - src/VendorLocker/ParentClassMethodTypeOverrideGuard.php
+                 - rules/Privatization/NodeManipulator/VisibilityManipulator.php
 
         # more advanced usage, but not always working
         # see https://github.com/rectorphp/rector-src/actions/runs/11798721617/job/32865546672?pr=6422#step:5:110

diff --git a/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc b/rules-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/Fixture/SomeClass.php.inc
diff --git a/...r/ClassConst/PublicConstantVisibilityRector/Fixture/public_visibility_final_const.php.inc b/...r/ClassConst/PublicConstantVisibilityRector/Fixture/public_visibility_final_const.php.inc
diff --git a/...1/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php b/...1/Rector/ClassConst/PublicConstantVisibilityRector/PublicConstantVisibilityRectorTest.php
diff --git a/...s-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php b/...s-tests/Php71/Rector/ClassConst/PublicConstantVisibilityRector/config/configured_rule.php
diff --git a/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php b/rules/Php71/Rector/ClassConst/PublicConstantVisibilityRector.php
diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -262,7 +262,8 @@ private function isValidUnionType(Type $type): bool
     private function shouldSkipType(Type $type): bool
     {
         return ! $type instanceof MixedType &&
-            ! $type->isNull()->yes() &&
+            ! $type->isNull()
+                ->yes() &&
             ! $this->isValidUnionType($type);
     }
 

diff --git a/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php b/rules/TypeDeclaration/NodeAnalyzer/ClassMethodParamTypeCompleter.php
@@ -129,7 +129,8 @@ private function isClosureAndCallableType(Type $parameterStaticType, Type $argum
             return true;
         }
 
-        return $argumentStaticType->isCallable()->yes() && $this->isClosureObjectType($parameterStaticType);
+        return $argumentStaticType->isCallable()
+            ->yes() && $this->isClosureObjectType($parameterStaticType);
     }
 
     private function isClosureObjectType(Type $type): bool

diff --git a/src/NodeAnalyzer/PropertyAnalyzer.php b/src/NodeAnalyzer/PropertyAnalyzer.php
@@ -58,6 +58,7 @@ private function isCallableType(Type $type): bool
             return false;
         }
 
-        return $type->isCallable()->yes();
+        return $type->isCallable()
+            ->yes();
     }
 }
diff --git a/src/NodeTypeResolver/NodeTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver.php
@@ -431,7 +431,8 @@ private function isAnonymousObjectType(Type $type): bool
 
     private function isUnionTypeable(Type $first, Type $second): bool
     {
-        return ! $first instanceof UnionType && ! $second instanceof UnionType && ! $second->isNull()->yes();
+        return ! $first instanceof UnionType && ! $second instanceof UnionType && ! $second->isNull()
+            ->yes();
     }
 
     private function isMatchingUnionType(Type $resolvedType, ObjectType $requiredObjectType): bool

diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php
@@ -205,7 +205,9 @@ private function isIntegerKeyAndNonNestedArray(ArrayType $arrayType): bool
             return false;
         }
 
-        return ! $arrayType->getItemType()->isArray()->yes();
+        return ! $arrayType->getItemType()
+            ->isArray()
+            ->yes();
     }
 
     private function isClassStringArrayType(ArrayType $arrayType): bool

diff --git a/src/Set/ValueObject/LevelSetList.php b/src/Set/ValueObject/LevelSetList.php
@@ -4,12 +4,10 @@
 
 namespace Rector\Set\ValueObject;
 
-use Rector\Set\Contract\SetListInterface;
-
 /**
  * @api
  */
-final class LevelSetList implements SetListInterface
+final class LevelSetList
 {
     /**
      * @var string

diff --git a/src/Set/ValueObject/SetList.php b/src/Set/ValueObject/SetList.php
@@ -4,12 +4,10 @@
 
 namespace Rector\Set\ValueObject;
 
-use Rector\Set\Contract\SetListInterface;
-
 /**
  * @api
  */
-final class SetList implements SetListInterface
+final class SetList
 {
     /**
      * @internal

diff --git a/src/ValueObject/Error/SystemError.php b/src/ValueObject/Error/SystemError.php
@@ -22,11 +22,6 @@ public function getMessage(): string
         return $this->message;
     }
 
-    public function getFile(): string|null
-    {
-        return $this->relativeFilePath;
-    }
-
     public function getLine(): int|null
     {
         return $this->line;