PHPStan fixes

.circleci/config.yml

@@ -7,7 +7,7 @@ anchors:
   default_job_config: &default_job_config
     working_directory: /home/circleci/plugin
     machine:
-      image: ubuntu-2004:202201-02
+      image: default
 
 jobs:
   build_package_release:

.gitattributes

@@ -11,7 +11,8 @@ phpunit.xml.dist export-ignore
 README.md export-ignore
 strauss.phar export-ignore
 build export-ignore
-tests
+tests export-ignore
+phpstan-stubs export-ignore
 
 /.circleci export-ignore
 /.github export-ignore

.github/workflows/phpunit.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         php-versions: ['7.3', '7.4', '7.2']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -24,13 +24,15 @@ jobs:
         run: composer validate
       - name: Cache dependencies
         id: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: vendor
           key: ${{ runner.os }}-build-${{ matrix.php-versions }}-${{ hashFiles('composer.json') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ matrix.php-versions }}-
       - name: Install dependencies
+        env:
+          COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{secrets.COMPOSER_AUTH}}"} }'
         if: steps.cache.outputs.cache-hit != 'true'
         # We run `--no-scripts` to avoid using Strauss during unit tests
         run: composer install --prefer-dist --no-progress --no-scripts
@@ -40,5 +42,8 @@ jobs:
       - name: Run linter
         run: composer run-script linter
 
+      - name: Run PHPStan
+        run: composer run-script analyse
+
       - name: Run test suite
         run: composer run-script test

.gitignore

@@ -13,3 +13,4 @@ vendor_prefixed
 !vendor_prefixed/.gitkeep
 !build/strauss.phar
 !build/vendor_prefixed/.gitkeep
+phpstan.neon

composer.json

@@ -39,20 +39,40 @@
             "GFExcel\\": "src/"
         }
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "[email protected]:gravityforms/gravityforms.git"
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "gravityforms/gravitysurvey",
+                "version": "dev-master",
+                "source": {
+                    "type": "git",
+                    "url": "[email protected]:gravityforms/gravityformssurvey.git",
+                    "reference": "HEAD"
+                }
+            }
+        }
+    ],
     "autoload-dev": {
         "psr-4": {
             "GFExcel\\Tests\\": "tests/"
         }
     },
     "require-dev": {
+        "gravityforms/gravityforms": "dev-master",
+        "gravityforms/gravitysurvey": "dev-master",
         "phpunit/phpunit": "7.5.*",
         "10up/wp_mock": "0.4.*",
-        "szepeviktor/phpstan-wordpress": "^0.6.2",
-        "phpstan/phpstan-mockery": "^0.12.5",
+        "szepeviktor/phpstan-wordpress": "^1.0",
+        "phpstan/phpstan-mockery": "^1.1",
         "overtrue/phplint": "^2.1"
     },
     "scripts": {
-        "unbuild": "rm -rf build/composer.* build/vendor build/src",
+        "unbuild": "rm -rf build/composer.* build/vendor*/* build/src",
         "build": [
             "@unbuild",
             "cp composer.json build/composer.json",
@@ -64,6 +84,7 @@
         ],
         "linter": "vendor/bin/phplint --no-cache",
         "test": "vendor/bin/phpunit",
+        "analyse": "vendor/bin/phpstan",
         "post-install-cmd": [
             "composer dump-autoload -o"
         ],