Merge af971c2 into 40e75df

gongo · May 13, 2024 · 6868230 · 6868230
2 parents 40e75df + af971c2
commit 6868230
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,13 +27,34 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+        include:
+          - php-version: 5.4
+            unrun-phpstan: true
+          - php-version: 5.5
+            unrun-phpstan: true
+          - php-version: 5.6
+            unrun-phpstan: true
+          - php-version: 7.0
+            unrun-phpstan: true
+          - php-version: 7.1
+            unrun-phpstan: true
 
     steps:
     - uses: actions/checkout@v3
-    - uses: shivammathur/setup-php@v2
+
+    - name: Setup PHP (with composer)
+      uses: shivammathur/setup-php@v2
+      if: ${{ matrix.unrun-phpstan }}
       with:
         php-version: ${{ matrix.php-version }}
         tools: composer
+    - name: Setup PHP (with composer, phpstan)
+      if: ${{ ! matrix.unrun-phpstan }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        tools: composer, phpstan
+
     - name: Get composer cache directory
       id: composer-cache
       run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
@@ -55,3 +76,6 @@ jobs:
         # see: https://github.com/php-coveralls/php-coveralls/blob/v2.6.0/CHANGELOG.md
         [[ -f vendor/bin/php-coveralls ]] && COVERALLS_PATH=vendor/bin/php-coveralls || COVERALLS_PATH=vendor/bin/coveralls
         $COVERALLS_PATH
+    - name: Run PHPStan
+      if: ${{ ! matrix.unrun-phpstan }}
+      run: phpstan analyse -l 9 src
diff --git a/src/Request.php b/src/Request.php
@@ -112,15 +112,17 @@ private function injectEGPCSToGlobal()
      */
     protected function getInjectVariables()
     {
-        return str_split(strtolower(ini_get('variables_order')));
+        return str_split(
+            strtolower(ini_get('variables_order')) // @phpstan-ignore argument.type
+        );
     }
 
     /**
      * Recursively applies `addslashes` to each element of the array recursive.
      *
      * This method is **bang** .
      *
-     * @param string[] $theVariables
+     * @param mixed[] $theVariables
      * @return void
      */
     private function addSlashesRecursive(&$theVariables)
@@ -134,7 +136,7 @@ function (&$value) {
     }
 
     /**
-     * @param string[] $theVariables
+     * @param mixed[] $theVariables
      * @return void
      */
     protected function injectToGlobal(array $theVariables)

diff --git a/src/Session.php b/src/Session.php
@@ -20,6 +20,7 @@ public function pollute()
     }
 
     /**
+     * @param mixed[] $theVariables
      * @return void
      */
     protected function injectToGlobal(array $theVariables)