cs fix

Author: michalsn

system/BaseModel.php

@@ -795,7 +795,7 @@ protected function validateID($id, bool $allowArray = true): void
             // Check if arrays are allowed
             if (! $allowArray) {
                 throw new InvalidArgumentException(
-                    'Invalid primary key: only a single value is allowed, not an array.'
+                    'Invalid primary key: only a single value is allowed, not an array.',
                 );
             }
 
@@ -808,7 +808,7 @@ protected function validateID($id, bool $allowArray = true): void
             foreach ($id as $key => $valueId) {
                 if (is_array($valueId)) {
                     throw new InvalidArgumentException(
-                        sprintf('Invalid primary key at index %s: nested arrays are not allowed.', $key)
+                        sprintf('Invalid primary key at index %s: nested arrays are not allowed.', $key),
                     );
                 }
 
@@ -822,15 +822,16 @@ protected function validateID($id, bool $allowArray = true): void
         // Check for invalid single values
         if (in_array($id, [null, 0, '0', '', true, false], true)) {
             $type = is_bool($id) ? 'boolean ' . var_export($id, true) : var_export($id, true);
+
             throw new InvalidArgumentException(
-                sprintf('Invalid primary key: %s is not allowed.', $type)
+                sprintf('Invalid primary key: %s is not allowed.', $type),
             );
         }
 
         // Only allow int and string at this point
         if (! is_int($id) && ! is_string($id)) {
             throw new InvalidArgumentException(
-                sprintf('Invalid primary key: must be int or string, %s given.', get_debug_type($id))
+                sprintf('Invalid primary key: must be int or string, %s given.', get_debug_type($id)),
             );
         }
     }
@@ -1026,7 +1027,7 @@ public function update($id = null, $row = null): bool
     {
         if ($id !== null) {
             if (! is_array($id)) {
-              $id = [$id];
+                $id = [$id];
             }
 
             $this->validateID($id);

tests/system/Models/DeleteModelTest.php

@@ -160,7 +160,7 @@ public function testOnlyDeleted(): void
      *
      * @param int|string|null $emptyValue
      */
-    #[DataProvider('emptyPkValuesWithWhereClause')]
+    #[DataProvider('provideDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue')]
     public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void
     {
         $this->createModel(UserModel::class);
@@ -175,6 +175,24 @@ public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue
         }
     }
 
+    /**
+     * Data provider for tests using where() clause.
+     * These values go into WHERE clause, not through validateID().
+     *
+     * @return iterable<array{bool|int|string|null}>
+     */
+    public static function provideDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue(): iterable
+    {
+        return [
+            [0],
+            [null],
+            ['0'],
+            [''],
+            [true],
+            [false],
+        ];
+    }
+
     /**
      * @param int|string|null $emptyValue
      * @param class-string    $exception
@@ -201,7 +219,7 @@ public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue, string
 
         try {
             $this->createModel(UserModel::class)->delete($emptyValue);
-        } catch (DatabaseException | InvalidArgumentException) {
+        } catch (DatabaseException|InvalidArgumentException) {
             // Do nothing - both exceptions are expected for different values.
         }
 
@@ -343,22 +361,4 @@ public static function emptyPkValues(): iterable
             ],
         ];
     }
-
-    /**
-     * Data provider for tests using where() clause.
-     * These values go into WHERE clause, not through validateID().
-     *
-     * @return iterable<array{bool|int|string|null}>
-     */
-    public static function emptyPkValuesWithWhereClause(): iterable
-    {
-        return [
-            [0],
-            [null],
-            ['0'],
-            [''],
-            [true],
-            [false],
-        ];
-    }
 }

tests/system/Models/InsertModelTest.php

@@ -418,7 +418,7 @@ public function testInsertBatchWithCasts(): void
     public function testInsertWithInvalidPrimaryKeyWhenAutoIncrementDisabled(
         $invalidKey,
         string $exception,
-        string $exceptionMessage
+        string $exceptionMessage,
     ): void {
         $this->expectException($exception);
         $this->expectExceptionMessage($exceptionMessage);
@@ -501,12 +501,12 @@ public static function provideInvalidPrimaryKeyValues(): iterable
             "array with '0' string" => [
                 ['0'],
                 InvalidArgumentException::class,
-                "Invalid primary key: only a single value is allowed, not an array.",
+                'Invalid primary key: only a single value is allowed, not an array.',
             ],
             'array with empty array' => [
                 [[]],
                 InvalidArgumentException::class,
-                "Invalid primary key: only a single value is allowed, not an array.",
+                'Invalid primary key: only a single value is allowed, not an array.',
             ],
         ];
     }