cs

rectorphp · Jul 23, 2023 · 079cd51 · 079cd51
1 parent 2afa47c
commit 079cd51
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php b/packages/PHPStanStaticTypeMapper/DoctrineTypeAnalyzer.php
@@ -37,23 +37,22 @@ public function isDoctrineCollectionWithIterableUnionType(Type $type): bool
         return $arrayType instanceof ArrayType;
     }
 
-    private function isCollectionObjectType(Type $type): bool
+    public function isInstanceOfCollectionType(Type $type): bool
     {
-        if (! $type instanceof TypeWithClassName) {
+        if (! $type instanceof ObjectType) {
             return false;
         }
 
-        return $type->getClassName() === 'Doctrine\Common\Collections\Collection';
+        return $type->isInstanceOf('Doctrine\Common\Collections\Collection')
+            ->yes();
     }
 
-    public function isInstanceOfCollectionType(Type $type): bool
+    private function isCollectionObjectType(Type $type): bool
     {
-        if (! $type instanceof ObjectType) {
+        if (! $type instanceof TypeWithClassName) {
             return false;
         }
 
-        return $type->isInstanceOf('Doctrine\Common\Collections\Collection')
-            ->yes();
+        return $type->getClassName() === 'Doctrine\Common\Collections\Collection';
     }
-
 }
diff --git a/...Property/TypedPropertyFromStrictConstructorReadonlyClassRector/config/configured_rule.php b/...Property/TypedPropertyFromStrictConstructorReadonlyClassRector/config/configured_rule.php
@@ -5,7 +5,6 @@
 use Rector\Config\RectorConfig;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorReadonlyClassRector;
-use Rector\TypeDeclaration\Rector\Property\TypedPropertyFromStrictConstructorRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rule(TypedPropertyFromStrictConstructorReadonlyClassRector::class);

diff --git a/...TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php b/...TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorReadonlyClassRector.php
@@ -5,19 +5,14 @@
 namespace Rector\TypeDeclaration\Rector\Property;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
-use PhpParser\Node\Stmt\PropertyProperty;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\Php\PhpPropertyReflection;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
-use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
-use Rector\Core\Rector\AbstractRector;
 use Rector\Core\Rector\AbstractScopeAwareRector;
 use Rector\Core\Reflection\ReflectionResolver;
 use Rector\Core\ValueObject\MethodName;
@@ -51,7 +46,9 @@ public function __construct(
 
     public function getRuleDefinition(): RuleDefinition
     {
-        return new RuleDefinition('Add typed public properties based only on strict constructor types in readonly classes', [
+        return new RuleDefinition(
+            'Add typed public properties based only on strict constructor types in readonly classes',
+            [
             new CodeSample(
                 <<<'CODE_SAMPLE'
 /**
@@ -84,6 +81,7 @@ public function __construct(string $name)
 }
 CODE_SAMPLE
             ),
+
         ]);
     }
 
@@ -144,7 +142,10 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
                 $hasChanged = true;
             }
 
-            if ($this->propertyTypeDefaultValueAnalyzer->doesConflictWithDefaultValue($propertyProperty, $propertyType)) {
+            if ($this->propertyTypeDefaultValueAnalyzer->doesConflictWithDefaultValue(
+                $propertyProperty,
+                $propertyType
+            )) {
                 continue;
             }
 
@@ -166,9 +167,13 @@ public function provideMinPhpVersion(): int
         return PhpVersionFeature::TYPED_PROPERTIES;
     }
 
-    private function shouldSkipProperty(Property $property, Type $propertyType, ClassReflection $classReflection, Scope $scope): bool
-    {
-        if (!$property->isPublic()) {
+    private function shouldSkipProperty(
+        Property $property,
+        Type $propertyType,
+        ClassReflection $classReflection,
+        Scope $scope
+    ): bool {
+        if (! $property->isPublic()) {
             return true;
         }
 
@@ -190,7 +195,7 @@ private function shouldSkipProperty(Property $property, Type $propertyType, Clas
             }
         }
 
-        if (!$isReadOnlyByPhpdoc) {
+        if (! $isReadOnlyByPhpdoc) {
             return true;
         }
 

diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
@@ -5,13 +5,10 @@
 namespace Rector\TypeDeclaration\Rector\Property;
 
 use PhpParser\Node;
-use PhpParser\Node\Expr;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
-use PhpParser\Node\Stmt\PropertyProperty;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
 use Rector\Core\Rector\AbstractRector;
@@ -142,7 +139,10 @@ public function refactor(Node $node): ?Node
                 $hasChanged = true;
             }
 
-            if ($this->propertyTypeDefaultValueAnalyzer->doesConflictWithDefaultValue($propertyProperty, $propertyType)) {
+            if ($this->propertyTypeDefaultValueAnalyzer->doesConflictWithDefaultValue(
+                $propertyProperty,
+                $propertyType
+            )) {
                 continue;
             }
 

diff --git a/rules/TypeDeclaration/TypeAnalyzer/PropertyTypeDefaultValueAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/PropertyTypeDefaultValueAnalyzer.php
@@ -9,11 +9,12 @@
 use PHPStan\Type\Type;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
-final class PropertyTypeDefaultValueAnalyzer {
+final class PropertyTypeDefaultValueAnalyzer
+{
     public function __construct(
         private readonly StaticTypeMapper $staticTypeMapper
-    )
-    {}
+    ) {
+    }
 
     public function doesConflictWithDefaultValue(PropertyProperty $propertyProperty, Type $propertyType): bool
     {