Merge pull request #156 from shochdoerfer/feature/phpstan_1_0_0

Drop support for PHPStan 0.12.x

Author: shochdoerfer

.github/workflows/ci.yml

@@ -11,18 +11,8 @@ jobs:
     strategy:
       matrix:
         operating-system: ['ubuntu-latest']
-        php-versions: ['7.3', '7.4']
-        composer-prefer-lowest: [false]
-        coveralls: [false]
-        include:
-          - operating-system: 'ubuntu-latest'
-            php-versions: '7.4'
-            composer-prefer-lowest: true
-            coveralls: false
-          - operating-system: 'ubuntu-latest'
-            php-versions: '7.4'
-            composer-prefer-lowest: false
-            coveralls: true
+        php-versions: ['7.4', '7.4']
+        coveralls: [false, true]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -38,12 +28,6 @@ jobs:
       - name: Install Composer dependencies
         run: composer install
 
-      - name: Install lowest PHPStan version
-        if: matrix.composer-prefer-lowest == true
-        run: |
-          composer remove --no-update phpstan/phpstan phpstan/phpstan-phpunit phpstan/phpstan-strict-rules
-          composer require --prefer-lowest phpstan/phpstan:0.12.23 phpstan/phpstan-phpunit:0.12.11 phpstan/phpstan-strict-rules:0.12.3
-
       - name: Composer license check
         run: composer check-license
 

README.md

@@ -6,6 +6,11 @@ work for Magento 2 projects.
 [![Build Status](https://github.com/bitExpert/phpstan-magento/workflows/ci/badge.svg?branch=master)](https://github.com/bitExpert/phpstan-magento/actions)
 [![Coverage Status](https://coveralls.io/repos/github/bitExpert/phpstan-magento/badge.svg?branch=master)](https://coveralls.io/github/bitExpert/phpstan-magento?branch=master)
 
+## Requirements
+
+This PHPStan extension requires PHPStan 1.1. If you are using a Magento version that requires an older version of PHPStan,
+you need to manually upgrade before installing this extension.
+
 ## Installation
 
 The preferred way of installing `bitexpert/phpstan-magento` is through Composer.
@@ -25,8 +30,6 @@ includes:
 	- vendor/bitexpert/phpstan-magento/extension.neon
 ```
 
-⚠️ When you use a version of `phpstan/phpstan` lower than 0.12.26 you should replace `bootstrapFiles` with `autoload_files` in the configuration mentioned above.
-
 ## Features
 
 ### Class generator for factory & proxy classes

composer.json

@@ -17,7 +17,7 @@
   "require": {
     "php": "^7.2.0",
     "nette/neon": "^3.3.1",
-    "phpstan/phpstan": "^0.12.23"
+    "phpstan/phpstan": "^1.1.0"
   },
   "conflict": {
     "magento/framework": "<101.0.0"
@@ -30,8 +30,8 @@
     "mikey179/vfsstream": "^1.6.10",
     "nikic/php-parser": "^4.13.1",
     "phpstan/extension-installer": "^1.1.0",
-    "phpstan/phpstan-phpunit": "^0.12.22",
-    "phpstan/phpstan-strict-rules": "^0.12.11",
+    "phpstan/phpstan-phpunit": "^1.0.0",
+    "phpstan/phpstan-strict-rules": "^1.0.0",
     "phpunit/phpunit": "^9.5.10",
     "roave/security-advisories": "dev-latest",
     "squizlabs/php_codesniffer": "^3.6.1"

composer.lock

@@ -7,12 +7,33 @@ parameters:
         - src/bitExpert
         - tests/bitExpert
     ignoreErrors:
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: src/bitExpert/PHPStan/Magento/Autoload/Cache/FileCacheStorage.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: src/bitExpert/PHPStan/Magento/Autoload/FactoryAutoloader.php
         -
             message: '~Call to an undefined method ReflectionType::getName~'
             path: src/bitExpert/PHPStan/Magento/Autoload/ProxyAutoloader.php
         -
             message: '~Parameter #1 \$argument of class ReflectionClass constructor expects~'
             path: src/bitExpert/PHPStan/Magento/Autoload/ProxyAutoloader.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: src/bitExpert/PHPStan/Magento/Autoload/ProxyAutoloader.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: src/bitExpert/PHPStan/Magento/Reflection/Framework/Session/SessionManagerMagicMethodReflectionExtension.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: src/bitExpert/PHPStan/Magento/Reflection/AbstractMagicMethodReflectionExtension.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: tests/bitExpert/PHPStan/Magento/Autoload/FactoryAutoloaderUnitTest.php
+        -
+            message: '~is not covered by backward compatibility promise.~'
+            path: tests/bitExpert/PHPStan/Magento/Autoload/ProxyAutoloaderUnitTest.php
         -
             message: '~bitExpert\\PHPStan\\Magento\\Rules\\Helper\\SampleModel::__construct\(\) does not call parent constructor~'
             path: tests/bitExpert/PHPStan/Magento/Rules/Helper/SampleModel.php

phpstan.neon

@@ -31,14 +31,14 @@ protected function getRule(): Rule
         return new GetCollectionMockMethodNeedsCollectionSubclassRule();
     }
 
-    /**
-     * @return \PHPStan\Type\DynamicMethodReturnTypeExtension[]
-     */
-    public function getDynamicMethodReturnTypeExtensions() : array
+    public static function getAdditionalConfigFiles(): array
     {
-        return [
-            new TestFrameworkObjectManagerDynamicReturnTypeExtension(),
-        ];
+        // make sure to load \bitExpert\PHPStan\Magento\Type\TestFrameworkObjectManagerDynamicReturnTypeExtension
+        // which is needed for the integration test
+        return array_merge(
+            parent::getAdditionalConfigFiles(),
+            [__DIR__ . '/Helper/dynamic_method_returntype_extension.neon']
+        );
     }
 
     /**

tests/bitExpert/PHPStan/Magento/Rules/GetCollectionMockMethodNeedsCollectionSubclassRuleUnitTest.php

@@ -0,0 +1,5 @@
+services:
+	-
+		class: bitExpert\PHPStan\Magento\Type\TestFrameworkObjectManagerDynamicReturnTypeExtension
+		tags:
+			- phpstan.broker.dynamicMethodReturnTypeExtension

tests/bitExpert/PHPStan/Magento/Rules/Helper/dynamic_method_returntype_extension.neon

@@ -15,10 +15,10 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Testing\TestCase;
+use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\MixedType;
 
-class ObjectManagerDynamicReturnTypeExtensionUnitTest extends TestCase
+class ObjectManagerDynamicReturnTypeExtensionUnitTest extends PHPStanTestCase
 {
     /**
      * @var ObjectManagerDynamicReturnTypeExtension

tests/bitExpert/PHPStan/Magento/Type/ObjectManagerDynamicReturnTypeExtensionUnitTest.php

@@ -20,7 +20,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Testing\TestCase;
+use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
@@ -31,7 +31,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\UnionType;
 
-class TestFrameworkObjectManagerDynamicReturnTypeExtensionUnitTest extends TestCase
+class TestFrameworkObjectManagerDynamicReturnTypeExtensionUnitTest extends PHPStanTestCase
 {
     /**
      * @var TestFrameworkObjectManagerDynamicReturnTypeExtension