Type casting, documentation minor fixes

Author: simon-mundy

src/Adapter.php

@@ -72,7 +72,6 @@ protected function createDriver(array $parameters): DriverInterface
 
     protected function createPlatform(array $parameters): PlatformInterface
     {
-        $platformName = $parameters['platform'] ?? $this->driver->getDatabasePlatformName();
         // currently only supported by the IbmDb2 & Oracle concrete implementations
         // todo: check recent versions of mysqli and pdo to see if they support this
         $options = $parameters['platform_options'] ?? [];

src/ConfigProvider.php

@@ -5,12 +5,8 @@
 use Laminas\Db\Adapter\AdapterInterface;
 use Laminas\Db\Adapter\AdapterAbstractServiceFactory;
 use Laminas\Db\Adapter\AdapterServiceFactory;
-use Laminas\Db\Adapter\Driver\DriverInterface;
-use Laminas\Db\Adapter\Platform\PlatformInterface;
 use Laminas\Db\Container\MetadataFactory;
 use Laminas\Db\Metadata\MetadataInterface;
-use Laminas\ServiceManager\Factory\InvokableFactory;
-use PHPUnit\Metadata\Metadata;
 
 readonly class ConfigProvider
 {

src/DatabasePlatformNameTrait.php

@@ -4,17 +4,19 @@
 
 namespace Laminas\Db\Adapter\Mysql;
 
+use Laminas\Db\Adapter\Driver\DriverInterface;
+
 trait DatabasePlatformNameTrait
 {
     /**
      * Get database platform name
      *
-     * @param  string $nameFormat
+     * @param string $nameFormat
      * @return string
      */
-    public function getDatabasePlatformName($nameFormat = self::NAME_FORMAT_CAMELCASE)
+    public function getDatabasePlatformName(string $nameFormat = DriverInterface::NAME_FORMAT_CAMELCASE): string
     {
-        if ($nameFormat === self::NAME_FORMAT_CAMELCASE) {
+        if ($nameFormat === DriverInterface::NAME_FORMAT_CAMELCASE) {
             return 'Mysql';
         }
 

src/Driver/Mysqli/Connection.php

@@ -143,8 +143,7 @@ public function connect(): static
             $this->resource->ssl_set($clientKey, $clientCert, $caCert, $caPath, $cipher);
             //MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT is not valid option, needs to be set as flag
             if (
-                isset($p['driver_options'])
-                && isset($p['driver_options'][MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT])
+                isset($p['driver_options'][MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT])
             ) {
                 $flags |= MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
             }
@@ -154,7 +153,7 @@ public function connect(): static
             $flags === null
                 ? $this->resource->real_connect($hostname, $username, $password, $database, $port, $socket)
                 : $this->resource->real_connect($hostname, $username, $password, $database, $port, $socket, $flags);
-        } catch (GenericException $e) {
+        } catch (GenericException) {
             throw new Exception\RuntimeException(
                 'Connection error',
                 $this->resource->connect_errno,
@@ -254,15 +253,11 @@ public function execute($sql): ResultInterface
             $this->connect();
         }
 
-        if ($this->profiler) {
-            $this->profiler->profilerStart($sql);
-        }
+        $this->profiler?->profilerStart($sql);
 
         $resultResource = $this->resource->query($sql);
 
-        if ($this->profiler) {
-            $this->profiler->profilerFinish($sql);
-        }
+        $this->profiler?->profilerFinish($sql);
 
         // if the returnValue is something other than a mysqli_result, bypass wrapping it
         if ($resultResource === false) {

src/Driver/Mysqli/Mysqli.php

@@ -226,7 +226,7 @@ public function getPrepareType()
      * @param mixed  $type
      * @return string
      */
-    public function formatParameterName($name, $type = null)
+    public function formatParameterName($name, $type = null): string
     {
         return '?';
     }

src/Driver/Mysqli/Statement.php

@@ -143,7 +143,7 @@ public function setResource(mysqli_stmt $mysqliStatement)
     /**
      * Get sql
      *
-     * @return string
+     * @return string|null
      */
     public function getSql(): ?string
     {
@@ -173,10 +173,8 @@ public function isPrepared()
     /**
      * Prepare
      *
-     * @param string $sql
-     * @return $this Provides a fluent interface
-     * @throws Exception\InvalidQueryException
-     * @throws Exception\RuntimeException
+     * @param string|null $sql
+     * @return Statement|null Provides a fluent interface
      */
     public function prepare(?string $sql = null): ?static
     {
@@ -231,15 +229,11 @@ public function execute($parameters = null)
         }
         /** END Standard ParameterContainer Merging Block */
 
-        if ($this->profiler) {
-            $this->profiler->profilerStart($this);
-        }
+        $this->profiler?->profilerStart($this);
 
         $return = $this->resource->execute();
 
-        if ($this->profiler) {
-            $this->profiler->profilerFinish();
-        }
+        $this->profiler?->profilerFinish();
 
         if ($return === false) {
             throw new Exception\RuntimeException($this->resource->error);

src/Driver/Pdo/Connection.php

@@ -6,17 +6,14 @@
 
 use Laminas\Db\Adapter\Driver\Pdo\AbstractPdoConnection;
 use Laminas\Db\Adapter\Exception;
-use Laminas\Db\Adapter\Exception\RuntimeException;
 use Override;
 use PDOException;
 use PDOStatement;
 
 use function array_diff_key;
 use function implode;
-use function is_array;
 use function is_int;
 use function str_replace;
-use function strpos;
 use function strtolower;
 use function substr;
 
@@ -63,7 +60,7 @@ public function connect(): static
                     break;
                 case 'driver':
                     $value = strtolower((string) $value);
-                    if (strpos($value, 'pdo') === 0) {
+                    if (str_starts_with($value, 'pdo')) {
                         $pdoDriver = str_replace(['-', '_', ' '], '', $value);
                         $pdoDriver = substr($pdoDriver, 3) ?: '';
                     }
@@ -187,7 +184,7 @@ public function getLastGeneratedValue($name = null): string|int|bool|null
     {
         try {
             return $this->resource->lastInsertId($name);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             // do nothing
         }
 

src/Metadata/Source/MysqlMetadata.php

@@ -14,14 +14,16 @@
 use function preg_match;
 use function preg_match_all;
 use function str_replace;
-use function strpos;
 
 use const CASE_LOWER;
 use const PREG_PATTERN_ORDER;
 
 class MysqlMetadata extends AbstractSource
 {
-    protected function loadSchemaData()
+    /**
+     * @throws \Exception
+     */
+    protected function loadSchemaData(): void
     {
         if (isset($this->data['schemas'])) {
             return;
@@ -49,7 +51,7 @@ protected function loadSchemaData()
      * @param string $schema
      * @return void
      */
-    protected function loadTableNameData($schema)
+    protected function loadTableNameData($schema): void
     {
         if (isset($this->data['table_names'][$schema])) {
             return;
@@ -110,7 +112,7 @@ protected function loadTableNameData($schema)
      * @param string $schema
      * @return void
      */
-    protected function loadColumnData($table, $schema)
+    protected function loadColumnData($table, $schema): void
     {
         if (isset($this->data['columns'][$schema][$table])) {
             return;
@@ -185,7 +187,7 @@ protected function loadColumnData($table, $schema)
                 'character_octet_length'   => $row['CHARACTER_OCTET_LENGTH'],
                 'numeric_precision'        => $row['NUMERIC_PRECISION'],
                 'numeric_scale'            => $row['NUMERIC_SCALE'],
-                'numeric_unsigned'         => false !== strpos($row['COLUMN_TYPE'], 'unsigned'),
+                'numeric_unsigned'         => str_contains($row['COLUMN_TYPE'], 'unsigned'),
                 'erratas'                  => $erratas,
             ];
         }

test/integration/Driver/Mysqli/TraitSetup.php

@@ -7,11 +7,9 @@
 use Override;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 
-use function extension_loaded;
 use function getenv;
 use function is_string;
 use function sprintf;
-use function strtolower;
 
 // phpcs:ignore WebimpressCodingStandard.NamingConventions.Trait.Suffix
 trait TraitSetup

test/integration/Driver/Pdo/Mysql/AdapterTrait.php

@@ -8,8 +8,6 @@
 use Override;
 
 use function getenv;
-use function is_string;
-use function strtolower;
 
 trait AdapterTrait
 {