Fix additional documentation and code issues

dereuromark · dereuromark · commit 952e2c2dd3b7 · 2026-01-15T04:17:42.000+01:00
- Fix Mock::send() docblock: was incorrectly stating it returns empty array when no match (it throws MissingResponseException) - Fix Mock::send() $options param doc: was marked as "Unused" but is actually passed to match callbacks - Fix typo in MysqlSchemaDialect: "geoemetry" -> "geometry" - Add missing @param for describeGeometryColumns() - Fix inconsistent isset() check for $row['Extra'] in describeColumns() using null coalescing operator
diff --git a/src/Database/Schema/MysqlSchemaDialect.php b/src/Database/Schema/MysqlSchemaDialect.php
@@ -144,12 +144,11 @@ public function describeColumns(string $tableName): array
                 'comment' => $row['Comment'],
                 'length' => null,
             ];
-            if (isset($row['Extra']) && $row['Extra'] === 'auto_increment') {
+            $extra = $row['Extra'] ?? '';
+            if ($extra === 'auto_increment') {
                 $field['autoIncrement'] = true;
             }
-            if ($row['Extra'] === 'on update CURRENT_TIMESTAMP') {
-                $field['onUpdate'] = 'CURRENT_TIMESTAMP';
-            } elseif ($row['Extra'] === 'on update current_timestamp()') {
+            if ($extra === 'on update CURRENT_TIMESTAMP' || $extra === 'on update current_timestamp()') {
                 $field['onUpdate'] = 'CURRENT_TIMESTAMP';
             }
 
@@ -165,8 +164,9 @@ public function describeColumns(string $tableName): array
     }
 
     /**
-     * Describes geoemetry-specific column information.
+     * Describes geometry-specific column information.
      *
+     * @param string $table The table name.
      * @return array<string, array{name: string, srid: int}> The column information.
      */
     private function describeGeometryColumns(string $table): array
diff --git a/src/Http/Client/Adapter/Mock.php b/src/Http/Client/Adapter/Mock.php
@@ -71,8 +71,9 @@ public function addResponse(RequestInterface $request, Response $response, array
      * Find a response if one exists.
      *
      * @param \Psr\Http\Message\RequestInterface $request The request to match
-     * @param array<string, mixed> $options Unused.
-     * @return array<\Cake\Http\Client\Response> The matched response or an empty array for no matches.
+     * @param array<string, mixed> $options The options are passed to match callbacks.
+     * @return array<\Cake\Http\Client\Response> The matched response.
+     * @throws \Cake\Http\Client\Exception\MissingResponseException When no mock response matches.
      */
     public function send(RequestInterface $request, array $options): array
     {

Original file line number	Diff line number	Diff line change
`@@ -144,12 +144,11 @@ public function describeColumns(string $tableName): array`
`144`	`144`	`'comment' => $row['Comment'],`
`145`	`145`	`'length' => null,`
`146`	`146`	`];`
`147`		`- if (isset($row['Extra']) && $row['Extra'] === 'auto_increment') {`
	`147`	`+ $extra = $row['Extra'] ?? '';`
	`148`	`+ if ($extra === 'auto_increment') {`
`148`	`149`	`$field['autoIncrement'] = true;`
`149`	`150`	`}`
`150`		`- if ($row['Extra'] === 'on update CURRENT_TIMESTAMP') {`
`151`		`- $field['onUpdate'] = 'CURRENT_TIMESTAMP';`
`152`		`- } elseif ($row['Extra'] === 'on update current_timestamp()') {`
	`151`	`+ if ($extra === 'on update CURRENT_TIMESTAMP' \|\| $extra === 'on update current_timestamp()') {`
`153`	`152`	`$field['onUpdate'] = 'CURRENT_TIMESTAMP';`
`154`	`153`	`}`
`155`	`154`
`@@ -165,8 +164,9 @@ public function describeColumns(string $tableName): array`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`/**`
`168`		`- * Describes geoemetry-specific column information.`
	`167`	`+ * Describes geometry-specific column information.`
`169`	`168`	`*`
	`169`	`+ * @param string $table The table name.`
`170`	`170`	`* @return array<string, array{name: string, srid: int}> The column information.`
`171`	`171`	`*/`
`172`	`172`	`private function describeGeometryColumns(string $table): array`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,9 @@ public function addResponse(RequestInterface $request, Response $response, array`
`71`	`71`	`* Find a response if one exists.`
`72`	`72`	`*`
`73`	`73`	`* @param \Psr\Http\Message\RequestInterface $request The request to match`
`74`		`- * @param array<string, mixed> $options Unused.`
`75`		`- * @return array<\Cake\Http\Client\Response> The matched response or an empty array for no matches.`
	`74`	`+ * @param array<string, mixed> $options The options are passed to match callbacks.`
	`75`	`+ * @return array<\Cake\Http\Client\Response> The matched response.`
	`76`	`+ * @throws \Cake\Http\Client\Exception\MissingResponseException When no mock response matches.`
`76`	`77`	`*/`
`77`	`78`	`public function send(RequestInterface $request, array $options): array`
`78`	`79`	`{`