Manually merge 3.0.x into master

.github/workflows/continuous-integration.yml

@@ -0,0 +1,33 @@
+
+name: "Continuous Integration"
+
+on:
+  pull_request:
+
+jobs:
+  static-analysis-psalm:
+    name: Static Analysis with Psalm
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: "Install PHP"
+        uses: "shivammathur/[email protected]"
+        with:
+          coverage: "none"
+          php-version: "7.4"
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/[email protected]"
+        with:
+          path: "~/.composer/cache"
+          key: "composer-${{ hashFiles('composer.json') }}"
+          restore-keys: "composer-"
+
+      - name: "Install dependencies with composer"
+        run: "composer update --no-interaction --no-progress --no-suggest"
+
+      - name: Psalm
+        run: "vendor/bin/psalm"

.scrutinizer.yml

@@ -21,7 +21,7 @@ before_commands:
 tools:
     external_code_coverage:
         timeout: 3600
-        runs: 26 # 21x Travis (jobs with COVERAGE=yes) + 3x AppVeyor (jobs with coverage=yes) + 2x ContinuousPHP
+        runs: 24 # 21x Travis (jobs with COVERAGE=yes) + 2x AppVeyor (jobs with coverage=yes) + 1x ContinuousPHP
 
 filter:
     excluded_paths:

composer.json

@@ -40,11 +40,13 @@
     "require-dev": {
         "doctrine/coding-standard": "^7.0",
         "jetbrains/phpstorm-stubs": "^2019.1",
+        "nikic/php-parser": "^4.4",
         "phpstan/phpstan": "^0.12.18",
         "phpstan/phpstan-phpunit": "^0.12",
         "phpstan/phpstan-strict-rules": "^0.12.2",
         "phpunit/phpunit": "^9.1.1",
-        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
+        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
+        "vimeo/psalm": "^3.11"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."