Revert "move helpers to base class"

This reverts commit f7e5c88.

Author: mglaman

src/Rules/Deprecations/ConfigEntityConfigExportRule.php

@@ -4,6 +4,8 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\PhpDoc\ResolvedPhpDocBlock;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\ShouldNotHappenException;
 use function preg_match;
@@ -21,7 +23,7 @@ protected function doProcessNode(ClassReflection $reflection, Node\Stmt\Class_ $
         $phpDoc = $reflection->getResolvedPhpDoc();
         // Plugins should always be annotated, but maybe this class is missing its
         // annotation since it swaps an existing one.
-        if ($phpDoc === null || !$this->isAnnotated($phpDoc, '@ConfigEntityType')) {
+        if ($phpDoc === null || !$this->isAnnotated($phpDoc)) {
             return [];
         }
         $hasMatch = preg_match('/config_export\s?=\s?{/', $phpDoc->getPhpDocString());
@@ -35,4 +37,16 @@ protected function doProcessNode(ClassReflection $reflection, Node\Stmt\Class_ $
         }
         return [];
     }
+
+    private function isAnnotated(ResolvedPhpDocBlock $phpDoc): bool
+    {
+        foreach ($phpDoc->getPhpDocNodes() as $docNode) {
+            foreach ($docNode->children as $childNode) {
+                if (($childNode instanceof PhpDocTagNode) && $childNode->name === '@ConfigEntityType') {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 }

src/Rules/Deprecations/DeprecatedAnnotationsRuleBase.php

@@ -4,14 +4,9 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
-use PHPStan\PhpDoc\ResolvedPhpDocBlock;
-use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
-use ReflectionAttribute;
-use ReflectionClass;
-use ReflectionException;
 
 /**
  * @implements Rule<Node\Stmt\Class_>
@@ -69,28 +64,4 @@ public function processNode(Node $node, Scope $scope): array
 
         return $this->doProcessNode($reflection, $node, $scope);
     }
-
-    protected function isAnnotated(ResolvedPhpDocBlock $phpDoc, string $annotationId): bool
-    {
-        foreach ($phpDoc->getPhpDocNodes() as $docNode) {
-            foreach ($docNode->children as $childNode) {
-                if (($childNode instanceof PhpDocTagNode) && $childNode->name === $annotationId) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    protected function getPluginAttribute(ClassReflection $reflection, string $attributeName): ?ReflectionAttribute
-    {
-        try {
-            $nativeReflection = new ReflectionClass($reflection->getName());
-            $attribute = $nativeReflection->getAttributes($attributeName);
-        } catch (ReflectionException) {
-            return null;
-        }
-
-        return $attribute[0] ?? null;
-    }
 }

src/Rules/Deprecations/FieldTypeCategoryRule.php

@@ -9,8 +9,11 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\ResolvedPhpDocBlock;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\Reflection\ClassReflection;
 use ReflectionAttribute;
+use ReflectionClass;
+use ReflectionException;
 use function array_key_exists;
 use function preg_match;
 
@@ -39,12 +42,12 @@ protected function doProcessNode(ClassReflection $reflection, Node\Stmt\Class_ $
 
         $phpDoc = $reflection->getResolvedPhpDoc();
         if ($phpDoc instanceof ResolvedPhpDocBlock) {
-            if ($this->isAnnotated($phpDoc, '@FieldType') && preg_match('/category\s?=\s?@Translation/', $phpDoc->getPhpDocString()) === 1) {
+            if ($this->hasFieldTypeAnnotation($phpDoc) && preg_match('/category\s?=\s?@Translation/', $phpDoc->getPhpDocString()) === 1) {
                 $errors[] = self::DEPRECATION_MESSAGE;
             }
         }
 
-        $fieldTypeAttributes = $this->getPluginAttribute($reflection, FieldType::class);
+        $fieldTypeAttributes = $this->getFieldTypeAttributes($reflection);
         if ($fieldTypeAttributes instanceof ReflectionAttribute) {
             $arguments = $fieldTypeAttributes->getArguments();
             if (array_key_exists('category', $arguments) && $arguments['category'] instanceof TranslatableMarkup) {
@@ -54,4 +57,47 @@ protected function doProcessNode(ClassReflection $reflection, Node\Stmt\Class_ $
 
         return $errors;
     }
+
+    /**
+     * Checks whether a PHP doc block contains a field type annotation.
+     *
+     * @param \PHPStan\PhpDoc\ResolvedPhpDocBlock $phpDoc
+     *   The PHP doc block object.
+     *
+     * @return bool
+     *   True if it does, otherwise false.
+     */
+    private function hasFieldTypeAnnotation(ResolvedPhpDocBlock $phpDoc): bool
+    {
+        foreach ($phpDoc->getPhpDocNodes() as $docNode) {
+            foreach ($docNode->children as $childNode) {
+                if (($childNode instanceof PhpDocTagNode) && $childNode->name === '@FieldType') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks whether a given class has a field type attribute.
+     *
+     * @param \PHPStan\Reflection\ClassReflection $reflection
+     *   The class reflection object.
+     *
+     * @return ReflectionAttribute|null
+     *   The attribute, or null.
+     */
+    private function getFieldTypeAttributes(ClassReflection $reflection): ?ReflectionAttribute
+    {
+        try {
+            $nativeReflection = new ReflectionClass($reflection->getName());
+            $attribute = $nativeReflection->getAttributes(FieldType::class);
+        } catch (ReflectionException $e) {
+            return null;
+        }
+
+        return $attribute[0] ?? null;
+    }
 }