feat: add ShouldHaveOnlyOnePublicMethod rule

carlosas · Oct 3, 2023 · cdf07f6 · cdf07f6
1 parent cf8fac1
commit cdf07f6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/src/Rule/Assertion/Declaration/ShouldHaveOnlyOnePublicMethod/HasOnlyOnePublicMethodRule.php b/src/Rule/Assertion/Declaration/ShouldHaveOnlyOnePublicMethod/HasOnlyOnePublicMethodRule.php
@@ -1,10 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PHPat\Rule\Assertion\Declaration\ShouldHaveOnlyOnePublicMethod;
 
 use PHPat\Rule\Extractor\Declaration\OnePublicMethodExtractor;
 
-class HasOnlyOnePublicMethodRule extends ShouldHaveOnlyOnePublicMethod
+final class HasOnlyOnePublicMethodRule extends ShouldHaveOnlyOnePublicMethod
 {
     use OnePublicMethodExtractor;
 }
diff --git a/...ule/Assertion/Declaration/ShouldHaveOnlyOnePublicMethod/ShouldHaveOnlyOnePublicMethod.php b/...ule/Assertion/Declaration/ShouldHaveOnlyOnePublicMethod/ShouldHaveOnlyOnePublicMethod.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PHPat\Rule\Assertion\Declaration\ShouldHaveOnlyOnePublicMethod;
 

diff --git a/src/Rule/Extractor/Declaration/OnePublicMethodExtractor.php b/src/Rule/Extractor/Declaration/OnePublicMethodExtractor.php
@@ -5,9 +5,6 @@
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
 use PHPStan\Node\InClassNode;
-use PHPStan\Reflection\MethodReflection;
-use ReflectionClass;
-use ReflectionMethod;
 
 trait OnePublicMethodExtractor
 {
@@ -21,9 +18,14 @@ public function getNodeType(): string
      */
     protected function meetsDeclaration(Node $node, Scope $scope): bool
     {
-        $reflectionClass = new ReflectionClass($node->getClassReflection()->getName());
-        $methods = $reflectionClass->getMethods(ReflectionMethod::IS_PUBLIC);
+        $reflectionClass = $node->getClassReflection()->getNativeReflection();
+        $methods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
 
-        return count($methods) === 1;
+        $methodsWithoutConstructor = array_filter(
+            $methods,
+            fn (\ReflectionMethod $method) => $method->getName() !== '__construct'
+        );
+
+        return count($methodsWithoutConstructor) === 1;
     }
 }
diff --git a/tests/fixtures/Special/ClassWithOnePublicMethod.php b/tests/fixtures/Special/ClassWithOnePublicMethod.php
@@ -6,8 +6,15 @@ class ClassWithOnePublicMethod
 {
     public const CONSTANT = 'constant';
     public string $property = 'property';
+    public string $anotherProperty;
 
-    public function publicMethod(): bool {
+    public function __construct()
+    {
+        $this->anotherProperty = 'anotherProperty';
+    }
+
+    public function publicMethod(): bool
+    {
         return true;
     }
 }
diff --git a/tests/unit/rules/ShouldHaveOnlyOnePublicMethod/ClassWithOnlyOnePublicMethodTest.php b/tests/unit/rules/ShouldHaveOnlyOnePublicMethod/ClassWithOnlyOnePublicMethodTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Tests\PHPat\unit\rules\ShouldHaveOnlyOnePublicMethod;
 
@@ -45,5 +45,4 @@ protected function getRule(): Rule
             self::getContainer()->getByType(FileTypeMapper::class)
         );
     }
-
 }
diff --git a/...ules/ShouldHaveOnlyOnePublicMethod/GoodImplementationClassWithOnlyOnePublicMethodTest.php b/...ules/ShouldHaveOnlyOnePublicMethod/GoodImplementationClassWithOnlyOnePublicMethodTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Tests\PHPat\unit\rules\ShouldHaveOnlyOnePublicMethod;
 
@@ -10,7 +10,6 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 use PHPStan\Type\FileTypeMapper;
-use Tests\PHPat\fixtures\FixtureClass;
 use Tests\PHPat\fixtures\Special\ClassWithOnePublicMethod;
 use Tests\PHPat\unit\FakeTestParser;
 
@@ -44,5 +43,4 @@ protected function getRule(): Rule
             self::getContainer()->getByType(FileTypeMapper::class)
         );
     }
-
 }