Merge pull request #17 from zonuexe/fix/typing-sqllexer

Fix CI configuration and update Psalm for development

.github/workflows/phpunit.yml

@@ -17,14 +17,18 @@ jobs:
     - name: Validate composer.json and composer.lock
       run: composer validate
 
-    - name: Cache Composer packages
+    - name: Get Composer Cache Directory
       id: composer-cache
+      run: |
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache Composer packages
       uses: actions/cache@v2
       with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-php-
+          ${{ runner.os }}-composer-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

.github/workflows/psalm.yml

@@ -14,14 +14,18 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Cache Composer packages
+    - name: Get Composer Cache Directory
       id: composer-cache
+      run: |
+        echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache Composer packages
       uses: actions/cache@v2
       with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-php-
+          ${{ runner.os }}-composer-
 
     - name: Install dependencies
       if: steps.composer-cache.outputs.cache-hit != 'true'

composer.json

@@ -25,7 +25,7 @@
     }
   },
   "require-dev": {
-    "vimeo/psalm": "^4.3",
+    "vimeo/psalm": "^4.6",
     "squizlabs/php_codesniffer": "^3.5",
     "phpunit/phpunit": "^9.5"
   }

psalm-baseline.xml

@@ -704,9 +704,8 @@
     </MixedOperand>
   </file>
   <file src="src/Schema/TableDefinition.php">
-    <MixedPropertyTypeCoercion occurrences="2">
+    <MixedPropertyTypeCoercion occurrences="1">
       <code>$autoIncrementOffsets</code>
-      <code>$columns</code>
     </MixedPropertyTypeCoercion>
   </file>
 </files>