Support PHP 8.1 & drop PHP 7.3 (#279)

psalm · Oct 20, 2022 · b7f1102 · b7f1102
1 parent b9511a3
commit b7f1102
Show file tree

Hide file tree

Showing 13 changed files with 127 additions and 228 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -18,20 +18,13 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - 7.3
-          - 7.4
           - 8.0
+          - 8.1
 
         dependencies:
           - highest
           - lowest
 
-        exclude:
-          - php-version: 7.3
-            dependencies: lowest
-          - php-version: 7.4
-            dependencies: lowest
-
     steps:
       - name: "Checkout"
         uses: actions/checkout@v2
@@ -71,32 +64,15 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - 7.1
-          - 7.2
-          - 7.3
-          - 7.4
           - 8.0
+          - 8.1
 
         symfony-version:
           - 4
           - 5
           - 6
 
         exclude:
-          - php-version: 7.1
-            symfony-version: 5
-          - php-version: 7.1
-            symfony-version: 6
-          - php-version: 7.2
-            symfony-version: 6
-          - php-version: 7.3
-            symfony-version: 6
-          - php-version: 7.4
-            symfony-version: 6
-          - php-version: 7.1
-            symfony-version: 6
-          - php-version: 8.0
-            symfony-version: 3
           - php-version: 8.0
             symfony-version: 6
 
@@ -125,7 +101,3 @@ jobs:
 
       - name: "Run acceptance tests with codeception"
         run: vendor/bin/codecept run -v -g symfony-common -g symfony-${{ matrix.symfony-version }}
-
-      - name: "Run acceptance tests with codeception PHP8 only tests"
-        run: vendor/bin/codecept run -v -g php-8
-        if: matrix.php-version == '8.0'
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-simplexml": "*",
         "symfony/framework-bundle": "^4.0 || ^5.0 || ^6.0",
         "vimeo/psalm": "^4.12"
@@ -27,7 +27,7 @@
         "symfony/serializer": "^4.0 || ^5.0 || ^6.0",
         "symfony/validator": "*",
         "twig/twig": "^2.10 || ^3.0",
-        "weirdan/codeception-psalm-module": "^0.13.1"
+        "weirdan/codeception-psalm-module": "dev-master"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Test/CodeceptionModule.php b/src/Test/CodeceptionModule.php
@@ -4,6 +4,7 @@
 
 namespace Psalm\SymfonyPsalmPlugin\Test;
 
+use Behat\Gherkin\Node\PyStringNode;
 use Codeception\Exception\ModuleRequireException;
 use Codeception\Module as BaseModule;
 use Codeception\TestInterface;
@@ -21,15 +22,6 @@
  */
 class CodeceptionModule extends BaseModule
 {
-    /**
-     * @var mixed[]
-     *
-     * @psalm-suppress NonInvariantDocblockPropertyType
-     */
-    protected $config = [
-        'default_dir' => 'tests/_run/',
-    ];
-
     private const DEFAULT_TWIG_TEMPLATES_DIR = 'templates';
 
     /**
@@ -52,6 +44,13 @@ class CodeceptionModule extends BaseModule
      */
     private $suppressedIssueHandlers = [];
 
+    public function _initialize(): void
+    {
+        $this->_setConfig([
+            'default_dir' => 'tests/_run/',
+        ]);
+    }
+
     public function _after(TestInterface $test): void
     {
         $this->twigCache = $this->lastCachePath = null;
@@ -69,7 +68,7 @@ public function setTheTemplateRootDirectory(string $rootDir): void
     /**
      * @Given I have the following :templateName template :code
      */
-    public function haveTheFollowingTemplate(string $templateName, string $code): void
+    public function haveTheFollowingTemplate(string $templateName, PyStringNode $code): void
     {
         $rootDirectory = rtrim($this->config['default_dir'], DIRECTORY_SEPARATOR);
         $templatePath = (
@@ -82,7 +81,7 @@ public function haveTheFollowingTemplate(string $templateName, string $code): vo
             mkdir($templateDirectory, 0755, true);
         }
 
-        file_put_contents($templatePath, $code);
+        file_put_contents($templatePath, $code->getRaw());
     }
 
     /**
@@ -137,9 +136,16 @@ public function configureIgnoredIssueHandlers(string $issueHandlers): void
 
     /**
      * @Given I have Symfony plugin enabled
+     */
+    public function configureCommonPsalmconfigEmpty(): void
+    {
+        $this->configureCommonPsalmconfig(new PyStringNode([], 0));
+    }
+
+    /**
      * @Given I have Symfony plugin enabled with the following config :configuration
      */
-    public function configureCommonPsalmconfig(string $configuration = ''): void
+    public function configureCommonPsalmconfig(PyStringNode $configuration): void
     {
         $suppressedIssueHandlers = implode("\n", array_map(function (string $issueHandler) {
             return "<$issueHandler errorLevel=\"info\"/>";
@@ -161,7 +167,7 @@ public function configureCommonPsalmconfig(string $configuration = ''): void
 
     <plugins>
       <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
-        $configuration
+        {$configuration->getRaw()}
       </pluginClass>
     </plugins>
     <issueHandlers>

diff --git a/tests/acceptance/acceptance/AuthenticatorInterface.feature b/tests/acceptance/acceptance/AuthenticatorInterface.feature
@@ -1,4 +1,4 @@
-@symfony-common
+@symfony-4 @symfony-5
 Feature: AuthenticatorInterface
 
   Background:

diff --git a/tests/acceptance/acceptance/ServiceSubscriber.feature b/tests/acceptance/acceptance/ServiceSubscriber.feature
@@ -1,4 +1,4 @@
-@symfony-4 @symfony-5 @symfony-6
+@symfony-common
 Feature: Service Subscriber
 
   Background:
@@ -26,7 +26,7 @@ Feature: Service Subscriber
           $this->container = $container;
         }
 
-        public static function getSubscribedServices()
+        public static function getSubscribedServices(): array
         {
           return [
             // takes container.xml into account

diff --git a/tests/acceptance/acceptance/TestContainerService.feature b/tests/acceptance/acceptance/TestContainerService.feature
@@ -1,4 +1,4 @@
-@symfony-4 @symfony-5 @symfony-6
+@symfony-5 @symfony-6
 Feature: Test Container service
 
   Background:
@@ -21,7 +21,7 @@ Feature: Test Container service
       {
         public function testService(): void
         {
-          $service = static::$container->get('dummy_private_service');
+          $service = static::getContainer()->get('dummy_private_service');
           trim($service->foo());
         }
       }
@@ -42,7 +42,7 @@ Feature: Test Container service
       {
         public function testService(): void
         {
-          $service = static::$container->get('dummy_private_service');
+          $service = static::getContainer()->get('dummy_private_service');
           trim($service->foo());
         }
       }

diff --git a/tests/acceptance/acceptance/TwigTaintingWithCachedTemplates.feature b/tests/acceptance/acceptance/TwigTaintingWithCachedTemplates.feature
diff --git a/...ce/acceptance/SerializerInterface.feature → ...ce/serializer/SerializerInterface.feature b/...ce/acceptance/SerializerInterface.feature → ...ce/serializer/SerializerInterface.feature
@@ -1,4 +1,4 @@
-@symfony-common
+@symfony-4 @symfony-5
 Feature: Serializer interface
   Detect SerializerInterface::deserialize() result type