stash local changes prior to pulling code from @simon-mundy

Signed-off-by: Joey Smith <jsmith@webinertia.net>

Signed-off-by: Joey Smith <jsmith@webinertia.net>

Author: tyrsson

src/DatabasePlatformNameTrait.php

@@ -4,6 +4,9 @@
 
 namespace Laminas\Db\Adapter\Mysql;
 
+use Laminas\Db\Adapter\Driver\DriverInterface;
+use Laminas\Db\Adapter\Exception;
+
 trait DatabasePlatformNameTrait
 {
     /**
@@ -12,12 +15,18 @@ trait DatabasePlatformNameTrait
      * @param  string $nameFormat
      * @return string
      */
-    public function getDatabasePlatformName($nameFormat = self::NAME_FORMAT_CAMELCASE)
+    public function getDatabasePlatformName($nameFormat = DriverInterface::NAME_FORMAT_CAMELCASE)
     {
-        if ($nameFormat === self::NAME_FORMAT_CAMELCASE) {
+        if ($nameFormat === DriverInterface::NAME_FORMAT_CAMELCASE) {
             return 'Mysql';
         }
 
-        return 'MySQL';
+        if ($nameFormat === DriverInterface::NAME_FORMAT_NATURAL) {
+            return 'MySQL';
+        }
+
+        throw new Exception\InvalidArgumentException(
+            'Invalid name format provided. Must be one of: ' . DriverInterface::NAME_FORMAT_CAMELCASE . ', ' . DriverInterface::NAME_FORMAT_NATURAL
+        );
     }
 }

src/Driver/Pdo/Pdo.php

@@ -8,14 +8,15 @@
 use Laminas\Db\Adapter\Driver\Pdo\Result;
 use Laminas\Db\Adapter\Driver\Pdo\Statement;
 use Laminas\Db\Adapter\Driver\Feature\AbstractFeature;
-use Laminas\Db\Adapter\Exception;
+use Laminas\Db\Adapter\Mysql\DatabasePlatformNameTrait;
 use Laminas\Db\Adapter\Profiler;
 
 use function is_array;
-use function ucfirst;
 
 class Pdo extends AbstractPdo
 {
+    use DatabasePlatformNameTrait;
+
     /**
      * @param array|Connection|\PDO $connection
      * @param string $features
@@ -102,30 +103,4 @@ public function getFeature($name)
         }
         return false;
     }
-
-    /**
-     * Get database platform name
-     *
-     * @param  string $nameFormat
-     * @return string
-     */
-    public function getDatabasePlatformName($nameFormat = self::NAME_FORMAT_CAMELCASE): string
-    {
-        $name = $this->getConnection()->getDriverName();
-
-        if ($nameFormat === self::NAME_FORMAT_CAMELCASE) {
-            return ucfirst($name);
-        }
-
-        if ($nameFormat === self::NAME_FORMAT_NATURAL) {
-            return match ($name) {
-                'mysql' => 'MySQL',
-                default => ucfirst($name),
-            };
-        }
-
-        throw new Exception\InvalidArgumentException(
-            'Invalid name format provided. Must be one of: ' . self::NAME_FORMAT_CAMELCASE . ', ' . self::NAME_FORMAT_NATURAL
-        );
-    }
 }