Merge pull request #24 from enricodelazzari/main

invade without reflection

.github/workflows/phpstan.yml

@@ -0,0 +1,26 @@
+name: PHPStan
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'phpstan.neon.dist'
+
+jobs:
+  phpstan:
+    name: phpstan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v2
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 8.1]
+        php: [8.0, 8.1, 8.2]
         stability: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}

README.md

@@ -61,20 +61,10 @@ Using `invade` you can also call private functions.
 invade($myClass)->privateMethod(); // returns 'private return value'
 ```
 
-### Making PHPStan understand Invade
-
-PHPStan will report errors for every invaded private method and property as it is not aware that you can now access them. To remove these errors install the [PHPStan extension installer](https://github.com/phpstan/extension-installer) or add the invade PHPStan extension manually to your PHPStan configuration:
-
-```yaml
-includes:
-    - ./vendor/spatie/invade/phpstan-extension.neon
-```
-
 ## Testing
 
 ```bash
 composer test
-vendor/bin/phpstan analyse -c types/phpstan.neon.dist
 ```
 
 ## Changelog

composer.json

@@ -36,23 +36,16 @@
         }
     },
     "scripts": {
+        "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",
-        "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
+        "test-coverage": "vendor/bin/pest --coverage"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true
         }
     },
-    "extra": {
-        "phpstan": {
-            "includes": [
-                "phpstan-extension.neon"
-            ]
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

phpstan.neon.dist

@@ -0,0 +1,9 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 4
+    paths:
+        - src
+    tmpDir: build/phpstan
+    checkMissingIterableValueType: false

src/Invader.php

@@ -2,51 +2,32 @@
 
 namespace Spatie\Invade;
 
-use ReflectionClass;
-
 /**
  * @template T of object
  * @mixin T
  */
 class Invader
 {
-    /** @var T */
-    public object $obj;
-    public ReflectionClass $reflected;
-
     /**
      * @param T $obj
      */
-    public function __construct(object $obj)
-    {
-        $this->obj = $obj;
-        $this->reflected = new ReflectionClass($obj);
+    public function __construct(
+        public object $obj
+    ) {
     }
 
     public function __get(string $name): mixed
     {
-        $property = $this->reflected->getProperty($name);
-
-        $property->setAccessible(true);
-
-        return $property->getValue($this->obj);
+        return (fn () => $this->{$name})->call($this->obj);
     }
 
     public function __set(string $name, mixed $value): void
     {
-        $property = $this->reflected->getProperty($name);
-
-        $property->setAccessible(true);
-
-        $property->setValue($this->obj, $value);
+        (fn () => $this->{$name} = $value)->call($this->obj);
     }
 
     public function __call(string $name, array $params = []): mixed
     {
-        $method = $this->reflected->getMethod($name);
-
-        $method->setAccessible(true);
-
-        return $method->invoke($this->obj, ...$params);
+        return (fn () => $this->{$name}(...$params))->call($this->obj);
     }
 }