Merge pull request #4 from calebdw/3-abstract

feat: find computed properties in abstract classes

.github/workflows/tests.yml

@@ -1,3 +1,4 @@
+---
 name: Tests
 
 on:
@@ -7,11 +8,6 @@ on:
       - 'docs/**'
     branches:
       - "**"
-  pull_request:
-    types: [ready_for_review, synchronize, opened]
-    paths-ignore:
-      - "**.md"
-      - 'docs/**'
 
 jobs:
   tests:

composer.json

@@ -48,10 +48,12 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "scripts": {
-    "test:phpstan": "phpstan analyze --ansi",
+    "test:phpstan:src": "phpstan analyze --ansi",
+    "test:phpstan:integration": "phpstan analyze --ansi -c tests/phpstan-tests.neon",
     "test:phpunit": "phpunit --colors=always",
     "test": [
-      "@test:phpstan",
+      "@test:phpstan:src",
+      "@test:phpstan:integration",
       "@test:phpunit"
     ]
   }

phpstan.neon.dist

@@ -1,4 +1,4 @@
 parameters:
-    level: max
-    paths:
-        - src
+  level: max
+  paths:
+    - src

src/Properties/ComputedPropertyExtension.php

@@ -20,10 +20,6 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
             return false;
         }
 
-        if ($classReflection->isAbstract()) {
-            return false;
-        }
-
         if ($classReflection->hasNativeMethod($this->getterPropertyName($propertyName))) {
             return true;
         }

tests/Fixtures/AbstractBaseComponent.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CalebDW\LarastanLivewire\Tests\Fixtures;
+
+use Livewire\Component;
+
+abstract class AbstractBaseComponent extends Component
+{
+    use TraitWithComputedProperties;
+
+    public function testIntegration(): string
+    {
+        return $this->traitMethod
+            .$this->trait_method
+            .$this->traitGetter
+            .$this->trait_getter;
+    }
+}

tests/stubs/TestComponentWithComputedProperties.php → tests/Fixtures/TestComponentWithComputedProperties.php

@@ -2,15 +2,12 @@
 
 declare(strict_types=1);
 
-namespace CalebDW\LarastanLivewire\Tests\stubs;
+namespace CalebDW\LarastanLivewire\Tests\Fixtures;
 
 use Livewire\Attributes\Computed;
-use Livewire\Component;
 
-final class TestComponentWithComputedProperties extends Component
+class TestComponentWithComputedProperties extends AbstractBaseComponent
 {
-    use TraitWithComputedProperties;
-
     public function notAComputedProperty(): bool
     {
         return true;
@@ -25,6 +22,8 @@ private function privateMethod(): bool
     #[Computed]
     protected function protectedMethod(): bool
     {
+        $this->privateMethod();
+
         return true;
     }
 
@@ -73,4 +72,27 @@ public function getGetterStyleProperty(): array
     {
         return ['foo', 'bar'];
     }
+
+    public function testIntegration(): string
+    {
+        return $this->privateMethod
+            .$this->private_method
+            .$this->protectedMethod
+            .$this->protected_method
+            .$this->property
+            .$this->propertyWithComments
+            .$this->property_with_comments
+            .$this->deprecatedProperty
+            .$this->deprecated_property
+            .$this->deprecatedPropertyWithDescription
+            .$this->deprecated_property_with_description
+            .$this->propertyWithGenerics[0]
+            .$this->property_with_generics[0]
+            .$this->getterStyle[0]
+            .$this->getter_style[0]
+            .$this->traitMethod
+            .$this->trait_method
+            .$this->traitGetter
+            .$this->trait_getter;
+    }
 }

tests/stubs/TraitWithComputedProperties.php → tests/Fixtures/TraitWithComputedProperties.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace CalebDW\LarastanLivewire\Tests\stubs;
+namespace CalebDW\LarastanLivewire\Tests\Fixtures;
 
 use Livewire\Attributes\Computed;
 
@@ -18,4 +18,12 @@ public function getTraitGetterProperty(): bool
     {
         return true;
     }
+
+    public function testIntegration(): string
+    {
+        return $this->traitMethod
+            .$this->trait_method
+            .$this->traitGetter
+            .$this->trait_getter;
+    }
 }

tests/Properties/ComputedPropertyExtensionTest.php

@@ -5,7 +5,7 @@
 namespace CalebDW\LarastanLivewire\Tests\Properties;
 
 use CalebDW\LarastanLivewire\Properties\ComputedPropertyExtension;
-use CalebDW\LarastanLivewire\Tests\stubs\TestComponentWithComputedProperties;
+use CalebDW\LarastanLivewire\Tests\Fixtures\TestComponentWithComputedProperties;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\VerbosityLevel;

tests/phpstan-tests.neon

@@ -0,0 +1,6 @@
+includes:
+  - ../extension.neon
+parameters:
+  level: max
+  paths:
+    - Fixtures