validate phpstan lvl 3

php-etl · Mar 6, 2023 · 7f7a18b · 7f7a18b
1 parent c79c29c
commit 7f7a18b
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 45 deletions.
diff --git a/.github/workflows/phpspec.yaml b/.github/workflows/phpspec.yaml
@@ -5,6 +5,16 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v3
+            -   uses: actions/cache@v3
+                with:
+                    path: '**/vendor'
+                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+                    restore-keys: |
+                        ${{ runner.os }}-composer-
+            -   name: "Set COMPOSER_ROOT_VERSION environment variable"
+                uses: "ergebnis/composer-root-version-action@main"
+                with:
+                    branch: "main"
             -   uses: php-actions/composer@v6
                 with:
                     args: --prefer-dist

diff --git a/.github/workflows/phpstan6.yaml b/.github/workflows/phpstan6.yaml
@@ -11,6 +11,10 @@ jobs:
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                     restore-keys: |
                         ${{ runner.os }}-composer-
+            -   name: "Set COMPOSER_ROOT_VERSION environment variable"
+                uses: "ergebnis/composer-root-version-action@main"
+                with:
+                    branch: "main"
             -   uses: php-actions/composer@v6
                 with:
                     args: '--prefer-dist'

diff --git a/.github/workflows/phpstan7.yaml b/.github/workflows/phpstan7.yaml
@@ -11,6 +11,10 @@ jobs:
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                     restore-keys: |
                         ${{ runner.os }}-composer-
+            -   name: "Set COMPOSER_ROOT_VERSION environment variable"
+                uses: "ergebnis/composer-root-version-action@main"
+                with:
+                    branch: "main"
             -   uses: php-actions/composer@v6
                 with:
                     args: '--prefer-dist'

diff --git a/.github/workflows/phpstan8.yaml b/.github/workflows/phpstan8.yaml
@@ -11,6 +11,10 @@ jobs:
                     key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
                     restore-keys: |
                         ${{ runner.os }}-composer-
+            -   name: "Set COMPOSER_ROOT_VERSION environment variable"
+                uses: "ergebnis/composer-root-version-action@main"
+                with:
+                    branch: "main"
             -   uses: php-actions/composer@v6
                 with:
                     args: '--prefer-dist'

diff --git a/.github/workflows/rector.yaml b/.github/workflows/rector.yaml
@@ -1,8 +1,7 @@
 # github action that checks code with Rector
 name: Rector
 
-on:
-    pull_request: null
+on: pull_request
 
 jobs:
     rector:
@@ -30,6 +29,11 @@ jobs:
                     php-version: '8.2'
                     coverage: none
 
+            -   name: "Set COMPOSER_ROOT_VERSION environment variable"
+                uses: "ergebnis/composer-root-version-action@main"
+                with:
+                    branch: "main"
+
             -   uses: "ramsey/composer-install@v2"
 
             -   run: bin/rector --ansi

diff --git a/composer.lock b/composer.lock
diff --git a/src/ClassMetadataBuilder.php b/src/ClassMetadataBuilder.php
@@ -25,7 +25,7 @@ public function __construct(
     /**
      * @template Subject of object
      * @param ClassReferenceMetadataInterface<Subject> $class
-     * @return ClassTypeMetadataInterface<Subject>
+     * @return ClassTypeMetadataInterface
      */
     public function buildFromReference(ClassReferenceMetadataInterface $class): ClassTypeMetadataInterface
     {

diff --git a/src/IntersectionTypeMetadata.php b/src/IntersectionTypeMetadata.php
@@ -26,7 +26,7 @@ public function count(): int
     }
 
     /**
-     * @return \Traversable<TypeMetadataInterface>
+     * @return \ArrayIterator<TypeMetadataInterface>
      */
     public function getIterator(): \ArrayIterator
     {

diff --git a/src/RelationGuesser/PublicPropertyMultipleRelationGuesser.php b/src/RelationGuesser/PublicPropertyMultipleRelationGuesser.php
@@ -41,7 +41,7 @@ private function filterTypes(TypeMetadataInterface $type): IterableTypeMetadataI
 
         $filtered = [];
         foreach ($type as $inner) {
-            if (!$type instanceof IterableTypeMetadataInterface) {
+            if (!$inner instanceof IterableTypeMetadataInterface) {
                 continue;
             }
 

diff --git a/src/RelationGuesser/PublicPropertyUnaryRelationGuesser.php b/src/RelationGuesser/PublicPropertyUnaryRelationGuesser.php
@@ -41,7 +41,7 @@ private function filterTypes(TypeMetadataInterface $type): CompositeTypeMetadata
 
         $filtered = [];
         foreach ($type as $inner) {
-            if (!$type instanceof CompositeTypeMetadataInterface) {
+            if (!$inner instanceof CompositeTypeMetadataInterface) {
                 continue;
             }
 

diff --git a/src/RelationGuesser/VirtualRelationGuesser.php b/src/RelationGuesser/VirtualRelationGuesser.php
@@ -39,7 +39,7 @@ private function isSingular(string $field): bool
     /**
      * @template Subject of object
      * @param ClassTypeMetadataInterface<Subject> $class
-     * @return \Iterator<RelationMetadataInterface<Subject>>
+     * @return \Iterator<RelationMetadataInterface>
      */
     public function __invoke(ClassTypeMetadataInterface $class): \Iterator
     {

diff --git a/src/TypeGuesser/Native/NativeTypeGuesser.php b/src/TypeGuesser/Native/NativeTypeGuesser.php
@@ -23,19 +23,19 @@ public function __invoke(\ReflectionClass $class, \ReflectionType $reflector): \
             yield new IntersectionTypeMetadata(...array_map(fn ($reflector) => $this($class, $reflector), $reflector->getTypes()));
         } elseif ($reflector instanceof \ReflectionNamedType && $reflector->isBuiltin()) {
             yield $this->builtInType($reflector->getName());
-        } elseif ('self' === $reflector->getName() || 'static' === $reflector->getName()) {
+        } elseif ('self' === (string) $reflector || 'static' === (string) $reflector) {
             try {
                 $classReflector = new \ReflectionClass($class->getName());
                 yield new ClassReferenceMetadata(
                     $classReflector->getShortName(),
                     $classReflector->getNamespaceName()
                 );
             } catch (\ReflectionException $e) {
-                throw new \RuntimeException(strtr('The class %class.name% was not declared. It does either not exist or it does not have been auto-loaded.', ['%class.name%' => $reflector->getName()]), 0, $e);
+                throw new \RuntimeException(strtr('The class %class.name% was not declared. It does either not exist or it does not have been auto-loaded.', ['%class.name%' => (string) $reflector]), 0, $e);
             }
         } else {
             try {
-                $classReflector = new \ReflectionClass($reflector->getName());
+                $classReflector = new \ReflectionClass($reflector);
 
                 if ($classReflector->isAnonymous()) {
                     throw new \RuntimeException('Reached an unexpected anonymous class.');
@@ -45,7 +45,7 @@ public function __invoke(\ReflectionClass $class, \ReflectionType $reflector): \
                     $classReflector->getNamespaceName()
                 );
             } catch (\ReflectionException $e) {
-                throw new \RuntimeException(strtr('The class %class.name% was not declared. It does either not exist or it does not have been auto-loaded.', ['%class.name%' => $reflector->getName()]), 0, $e);
+                throw new \RuntimeException(strtr('The class %class.name% was not declared. It does either not exist or it does not have been auto-loaded.', ['%class.name%' => (string) $reflector]), 0, $e);
             }
         }