Fix tests

doctrine · Sep 17, 2020 · 4601eab · 4601eab
1 parent 2ebb247
commit 4601eab
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/Driver/Mysqli/Statement.php b/src/Driver/Mysqli/Statement.php
@@ -28,7 +28,7 @@ final class Statement implements StatementInterface
 {
     /** @var string[] */
     protected static $_paramTypeMap = [
-        ParameterType::ASCII_STRING => 's',
+        ParameterType::ASCII => 's',
         ParameterType::STRING => 's',
         ParameterType::BINARY => 's',
         ParameterType::BOOLEAN => 'i',

diff --git a/src/Driver/PDO/SQLSrv/Statement.php b/src/Driver/PDO/SQLSrv/Statement.php
@@ -37,7 +37,7 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
 
                 break;
 
-            case ParameterType::ASCII_STRING:
+            case ParameterType::ASCII:
                 $type          = PDO::PARAM_STR;
                 $length        = 0;
                 $driverOptions = PDO::SQLSRV_ENCODING_SYSTEM;

diff --git a/src/Driver/PDO/Statement.php b/src/Driver/PDO/Statement.php
@@ -20,7 +20,7 @@ final class Statement implements StatementInterface
         ParameterType::NULL => PDO::PARAM_NULL,
         ParameterType::INTEGER => PDO::PARAM_INT,
         ParameterType::STRING => PDO::PARAM_STR,
-        ParameterType::ASCII_STRING => PDO::PARAM_STR,
+        ParameterType::ASCII => PDO::PARAM_STR,
         ParameterType::BINARY => PDO::PARAM_LOB,
         ParameterType::LARGE_OBJECT => PDO::PARAM_LOB,
         ParameterType::BOOLEAN => PDO::PARAM_BOOL,

diff --git a/src/Driver/SQLSrv/Statement.php b/src/Driver/SQLSrv/Statement.php
@@ -182,7 +182,7 @@ private function prepare()
                     ];
                     break;
 
-                case ParameterType::ASCII_STRING:
+                case ParameterType::ASCII:
                     $params[$column - 1] = [
                         &$variable,
                         SQLSRV_PARAM_IN,

diff --git a/src/ParameterType.php b/src/ParameterType.php
@@ -44,7 +44,7 @@ final class ParameterType
     /**
      * Represents an ascii string data type
      */
-    public const ASCII_STRING = 17;
+    public const ASCII = 17;
 
     /**
      * This class cannot be instantiated.

diff --git a/src/Types/AsciiStringType.php b/src/Types/AsciiStringType.php
@@ -22,7 +22,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform)
      */
     public function getBindingType()
     {
-        return ParameterType::ASCII_STRING;
+        return ParameterType::ASCII;
     }
 
     public function getName(): string

diff --git a/...tional/ParameterTypes/AsciiStringTest.php → ...s/Functional/ParameterTypes/AsciiTest.php b/...tional/ParameterTypes/AsciiStringTest.php → ...s/Functional/ParameterTypes/AsciiTest.php
@@ -8,7 +8,7 @@
 use Doctrine\DBAL\ParameterType;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 
-class AsciiStringTest extends FunctionalTestCase
+class AsciiTest extends FunctionalTestCase
 {
     public function testAsciiBinding(): void
     {
@@ -18,7 +18,7 @@ public function testAsciiBinding(): void
 
         $statement = $this->connection->prepare('SELECT sql_variant_property(?, \'BaseType\')');
 
-        $statement->bindValue(1, 'test', ParameterType::ASCII_STRING);
+        $statement->bindValue(1, 'test', ParameterType::ASCII);
         $results = $statement->execute()->fetchOne();
 
         self::assertEquals('varchar', $results);

diff --git a/tests/Functional/Types/AsciiStringTest.php b/tests/Functional/Types/AsciiStringTest.php
@@ -48,8 +48,8 @@ private function insert(string $id, string $value): void
             'id'  => $id,
             'val' => $value,
         ], [
-            ParameterType::ASCII_STRING,
-            ParameterType::ASCII_STRING,
+            ParameterType::ASCII,
+            ParameterType::ASCII,
         ]);
 
         self::assertSame(1, $result);
@@ -60,7 +60,7 @@ private function select(string $id): string
         $value = $this->connection->fetchOne(
             'SELECT val FROM ascii_table WHERE id = ?',
             [$id],
-            [ParameterType::ASCII_STRING]
+            [ParameterType::ASCII]
         );
 
         self::assertIsString($value);

diff --git a/tests/Types/AsciiStringTest.php b/tests/Types/AsciiStringTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
 
     public function testReturnCorrectBindingType(): void
     {
-        self::assertEquals($this->type->getBindingType(), ParameterType::ASCII_STRING);
+        self::assertEquals($this->type->getBindingType(), ParameterType::ASCII);
     }
 
     public function testDelegateToPlatformForSqlDeclaration(): void
@@ -34,7 +34,7 @@ public function testDelegateToPlatformForSqlDeclaration(): void
         foreach ($columnDefinitions as $column) {
             $platform = $this->createMock(AbstractPlatform::class);
             $platform->expects(self::once())
-                ->method('getAsciiTypeDeclarationSQL')
+                ->method('getAsciiStringTypeDeclarationSQL')
                 ->with($column);
 
             $this->type->getSQLDeclaration($column, $platform);