Fix issue psalm. (#253)

terabytesoftw · web-flow · commit 0ab59b5b874b · 2023-04-09T10:41:25.000-04:00
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -68,5 +68,8 @@ jobs:
           FULL_BRANCH_NAME: ${{ env.FULL_BRANCH_NAME }}
           WORK_PACKAGE_URL: ${{ env.WORK_PACKAGE_URL }}
 
+      - name: Install dependencies with composer.
+        run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
+
       - name: Check dependencies.
         run: vendor/bin/composer-require-checker
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -34,7 +34,6 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
 
         php:
           - '8.0'
@@ -56,13 +55,8 @@ jobs:
         run: composer self-update
 
       - name: Set environment variables pull request linux.
-        if: matrix.os == 'ubuntu-latest'
         uses: yiisoft/actions/db/environment-linux@master
 
-      - name: Set environment variables pull request windows.
-        if: matrix.os == 'windows-latest'
-        uses: yiisoft/actions/db/environment-windows@master
-
       - name: Install db.
         uses: yiisoft/actions/db/subpackage-install@master
         with:
diff --git a/src/DMLQueryBuilder.php b/src/DMLQueryBuilder.php
@@ -26,31 +26,31 @@ public function insertWithReturningPks(string $table, QueryInterface|array $colu
         throw new NotSupportedException(__METHOD__ . '() is not supported by SQLite.');
     }
 
-    public function resetSequence(string $tableName, int|string $value = null): string
+    public function resetSequence(string $table, int|string $value = null): string
     {
-        $table = $this->schema->getTableSchema($tableName);
+        $tableSchema = $this->schema->getTableSchema($table);
 
-        if ($table === null) {
-            throw new InvalidArgumentException("Table not found: '$tableName'.");
+        if ($tableSchema === null) {
+            throw new InvalidArgumentException("Table not found: '$table'.");
         }
 
-        $sequenceName = $table->getSequenceName();
+        $sequenceName = $tableSchema->getSequenceName();
 
         if ($sequenceName === null) {
-            throw new InvalidArgumentException("There is not sequence associated with table '$tableName'.'");
+            throw new InvalidArgumentException("There is not sequence associated with table '$table'.'");
         }
 
-        $tableName = $this->quoter->quoteTableName($tableName);
+        $tableName = $this->quoter->quoteTableName($table);
 
         if ($value !== null) {
             $value = "'" . ((int) $value - 1) . "'";
         } else {
-            $pk = $table->getPrimaryKey();
+            $pk = $tableSchema->getPrimaryKey();
             $key = $this->quoter->quoteColumnName(reset($pk));
             $value = '(SELECT MAX(' . $key . ') FROM ' . $tableName . ')';
         }
 
-        return 'UPDATE sqlite_sequence SET seq=' . $value . " WHERE name='" . $table->getName() . "'";
+        return 'UPDATE sqlite_sequence SET seq=' . $value . " WHERE name='" . $tableSchema->getName() . "'";
     }
 
     public function upsert(

Original file line number	Diff line number	Diff line change
`@@ -26,31 +26,31 @@ public function insertWithReturningPks(string $table, QueryInterface\|array $colu`
`26`	`26`	`throw new NotSupportedException(__METHOD__ . '() is not supported by SQLite.');`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function resetSequence(string $tableName, int\|string $value = null): string`
	`29`	`+ public function resetSequence(string $table, int\|string $value = null): string`
`30`	`30`	`{`
`31`		`- $table = $this->schema->getTableSchema($tableName);`
	`31`	`+ $tableSchema = $this->schema->getTableSchema($table);`
`32`	`32`
`33`		`- if ($table === null) {`
`34`		`- throw new InvalidArgumentException("Table not found: '$tableName'.");`
	`33`	`+ if ($tableSchema === null) {`
	`34`	`+ throw new InvalidArgumentException("Table not found: '$table'.");`
`35`	`35`	`}`
`36`	`36`
`37`		`- $sequenceName = $table->getSequenceName();`
	`37`	`+ $sequenceName = $tableSchema->getSequenceName();`
`38`	`38`
`39`	`39`	`if ($sequenceName === null) {`
`40`		`- throw new InvalidArgumentException("There is not sequence associated with table '$tableName'.'");`
	`40`	`+ throw new InvalidArgumentException("There is not sequence associated with table '$table'.'");`
`41`	`41`	`}`
`42`	`42`
`43`		`- $tableName = $this->quoter->quoteTableName($tableName);`
	`43`	`+ $tableName = $this->quoter->quoteTableName($table);`
`44`	`44`
`45`	`45`	`if ($value !== null) {`
`46`	`46`	`$value = "'" . ((int) $value - 1) . "'";`
`47`	`47`	`} else {`
`48`		`- $pk = $table->getPrimaryKey();`
	`48`	`+ $pk = $tableSchema->getPrimaryKey();`
`49`	`49`	`$key = $this->quoter->quoteColumnName(reset($pk));`
`50`	`50`	`$value = '(SELECT MAX(' . $key . ') FROM ' . $tableName . ')';`
`51`	`51`	`}`
`52`	`52`
`53`		`- return 'UPDATE sqlite_sequence SET seq=' . $value . " WHERE name='" . $table->getName() . "'";`
	`53`	`+ return 'UPDATE sqlite_sequence SET seq=' . $value . " WHERE name='" . $tableSchema->getName() . "'";`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function upsert(`