Merge branch '4.x' into no-phinx

cakephp · May 2, 2024 · 57332c3 · 57332c3
2 parents d34fdad + 3de99c3
commit 57332c3
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
         run: echo "date=$(date +'%Y-%m')" >> $GITHUB_OUTPUT
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ steps.key-date.outputs.date }}-${{ hashFiles('composer.json') }}-${{ matrix.prefer-lowest }}
@@ -117,7 +117,7 @@ jobs:
 
       - name: Code Coverage Report
         if: success() && matrix.php-version == '8.1' && matrix.db-type == 'mysql'
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
 
   testsuite-windows:
     runs-on: windows-2022

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="1.10.22" installed="1.10.22" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.13.1" installed="5.13.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="1.10.56" installed="1.10.56" location="./tools/phpstan" copy="false"/>
+  <phar name="psalm" version="5.20.0" installed="5.20.0" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "php": ">=8.1",
         "cakephp/cache": "^5.0",
         "cakephp/orm": "^5.0",
-        "robmorgan/phinx": "0.x-dev#c35379620f23319329bb9ed17b82f4bdcce2a91e"
+        "robmorgan/phinx": "^0.16.0"
     },
     "require-dev": {
         "cakephp/bake": "^3.0",

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
   <file src="src/Command/MigrationsCommand.php">
     <DeprecatedClass>
       <code>MigrationsDispatcher</code>
@@ -150,4 +150,16 @@
       <code>self::VERBOSITY_*</code>
     </MoreSpecificReturnType>
   </file>
+  <file src="src/Util/ColumnParser.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$this->regexpParseColumn]]></code>
+      <code><![CDATA[$this->regexpParseColumn]]></code>
+      <code><![CDATA[$this->regexpParseColumn]]></code>
+      <code><![CDATA[$this->regexpParseColumn]]></code>
+      <code><![CDATA[$this->regexpParseField]]></code>
+    </ArgumentTypeCoercion>
+    <TypeDoesNotContainType>
+      <code>empty($indexes[$indexName])</code>
+    </TypeDoesNotContainType>
+  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -27,5 +27,6 @@
         <PropertyNotSetInConstructor errorLevel="suppress"/>
         <UnresolvableInclude errorLevel="suppress"/>
         <UnsafeInstantiation errorLevel="suppress"/>
+        <RiskyTruthyFalsyComparison errorLevel="suppress"/>
     </issueHandlers>
 </psalm>
diff --git a/src/AbstractMigration.php b/src/AbstractMigration.php
@@ -45,6 +45,7 @@ public function table(string $tableName, array $options = []): Table
         }
 
         $table = new Table($tableName, $options, $this->getAdapter());
+        $this->tables[] = $table;
 
         return $table;
     }

diff --git a/src/Command/BakeSeedCommand.php b/src/Command/BakeSeedCommand.php
@@ -101,7 +101,7 @@ public function templateData(Arguments $arguments): array
             $namespace = $this->_pluginNamespace($this->plugin);
         }
 
-        $table = Inflector::tableize((string)$arguments->getArgumentAt(0));
+        $table = Inflector::underscore((string)$arguments->getArgumentAt(0));
         if ($arguments->hasOption('table')) {
             /** @var string $table */
             $table = $arguments->getOption('table');

diff --git a/src/Util/ColumnParser.php b/src/Util/ColumnParser.php
@@ -194,7 +194,7 @@ public function validArguments(array $arguments): array
     public function getTypeAndLength(string $field, ?string $type): array
     {
         if ($type && preg_match($this->regexpParseField, $type, $matches)) {
-            if (strpos($matches[2], ',') !== false) {
+            if (str_contains($matches[2], ',')) {
                 $matches[2] = explode(',', $matches[2]);
             }
 

diff --git a/src/Util/TableFinder.php b/src/Util/TableFinder.php
@@ -77,7 +77,7 @@ public function getTablesToBake(CollectionInterface $collection, array $options
             }
 
             foreach ($tableNamesInModel as $num => $table) {
-                if (str_contains($table, '.')) {
+                if ($table && str_contains($table, '.')) {
                     $split = array_reverse(explode('.', $table, 2));
 
                     $config = (array)ConnectionManager::getConfig($this->connection);
@@ -108,7 +108,7 @@ public function getTablesToBake(CollectionInterface $collection, array $options
      * Gets list Tables Names
      *
      * @param string|null $pluginName Plugin name if exists.
-     * @return string[]
+     * @return array<int, string|null>
      */
     public function getTableNames(?string $pluginName = null): array
     {
@@ -157,7 +157,7 @@ public function findTables(?string $pluginName = null): array
      *
      * @param string $className Name of Table Class.
      * @param string|null $pluginName Plugin name if exists.
-     * @return string[]
+     * @return list<null|string>
      */
     public function fetchTableName(string $className, ?string $pluginName = null): array
     {
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             $table = new Table($tableName, $options, $this->getAdapter());
+            $this->tables[] = $table;
             return $table;
         }
@@ Expand Down @@