Fix up TypeError cases found by PHPStan level 7/8

cakephp · Jan 7, 2023 · f84144d · f84144d
1 parent 7d4a153
commit f84144d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Driver.php b/Driver.php
@@ -753,7 +753,7 @@ public function schema(): string
      */
     public function lastInsertId(?string $table = null): string
     {
-        return $this->getPdo()->lastInsertId($table);
+        return (string)$this->getPdo()->lastInsertId($table);
     }
 
     /**

diff --git a/Type/BinaryUuidType.php b/Type/BinaryUuidType.php
@@ -118,6 +118,7 @@ protected function convertBinaryUuidToString(mixed $binary): string
         $string = unpack('H*', $binary);
         assert($string !== false, 'Could not unpack uuid');
 
+        /** @var array<string> $string */
         $string = preg_replace(
             '/([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})/',
             '$1-$2-$3-$4-$5',

diff --git a/Type/DateTimeType.php b/Type/DateTimeType.php
@@ -211,8 +211,9 @@ public function toPHP(mixed $value, Driver $driver): DateTime|DateTimeImmutable|
         }
 
         if (
-            !$this->keepDatabaseTimezone &&
-            $instance->getTimezone()->getName() !== $this->defaultTimezone->getName()
+            !$this->keepDatabaseTimezone
+            && $instance->getTimezone()
+            && $instance->getTimezone()->getName() !== $this->defaultTimezone->getName()
         ) {
             $instance = $instance->setTimezone($this->defaultTimezone);
         }
@@ -265,8 +266,9 @@ public function manyToPHP(array $values, array $fields, Driver $driver): array
             }
 
             if (
-                !$this->keepDatabaseTimezone &&
-                $instance->getTimezone()->getName() !== $this->defaultTimezone->getName()
+                !$this->keepDatabaseTimezone
+                && $instance->getTimezone()
+                && $instance->getTimezone()->getName() !== $this->defaultTimezone->getName()
             ) {
                 $instance = $instance->setTimezone($this->defaultTimezone);
             }

diff --git a/Type/EnumType.php b/Type/EnumType.php
@@ -179,7 +179,7 @@ public function marshal(mixed $value): ?BackedEnum
      * $this->getSchema()->setColumnType('status', EnumType::from(StatusEnum::class));
      * ```
      *
-     * @param string $enumClassName The enum class name
+     * @param class-string<\BackedEnum> $enumClassName The enum class name
      * @return string
      */
     public static function from(string $enumClassName): string