Remove "jsonb" and "version" options

UPGRADE.md

@@ -8,7 +8,16 @@ awareness about deprecated code.
 
 # Upgrade to 5.0
 
-## BC BREAK: Classes marked as read-only:
+## BC BREAK: Removed support for the `version` column platform option
+
+The `version` column platform option is no longer supported.
+
+## BC BREAK: Removed support for the `jsonb` column platform option
+
+The `jsonb` column platform option is no longer supported. `JSONB` columns on PostgreSQL are now introspected
+as columns of type `JSONB`, not as columns of type `JSON` with `jsonb` option set.
+
+## BC BREAK: Classes marked as read-only
 
 The following classes have been marked as read-only:
 
@@ -51,7 +60,7 @@ The following classes have been marked as read-only:
 - `Doctrine\DBAL\Tools\Console\ConnectionProvider\SingleConnectionProvider`
 - `Doctrine\DBAL\Tools\DsnParser`
 
-## BC BREAK: Classes marked as final:
+## BC BREAK: Classes marked as final
 
 The following classes have been marked as final:
 

src/Platforms/AbstractMySQLPlatform.php

@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\TransactionIsolationLevel;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_map;
 use function array_merge;
@@ -129,14 +128,6 @@ public function getListViewsSQL(string $database): string
      */
     public function getJsonTypeDeclarationSQL(array $column): string
     {
-        if (! empty($column['jsonb'])) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6939',
-                'The "jsonb" column platform option is deprecated. Use the "JSONB" type instead.',
-            );
-        }
-
         return 'JSON';
     }
 
@@ -175,16 +166,6 @@ public function getClobTypeDeclarationSQL(array $column): string
      */
     public function getDateTimeTypeDeclarationSQL(array $column): string
     {
-        if (isset($column['version']) && $column['version'] === true) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6940',
-                'The "version" column platform option is deprecated.',
-            );
-
-            return 'TIMESTAMP';
-        }
-
         return 'DATETIME';
     }
 

src/Platforms/AbstractPlatform.php

@@ -47,7 +47,6 @@
 use Doctrine\DBAL\Types\Exception\TypeNotFound;
 use Doctrine\DBAL\Types\Exception\TypesException;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 
 use function addcslashes;
 use function array_map;
@@ -256,14 +255,6 @@ public function getGuidTypeDeclarationSQL(array $column): string
      */
     public function getJsonTypeDeclarationSQL(array $column): string
     {
-        if (! empty($column['jsonb'])) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6939',
-                'The "jsonb" column platform option is deprecated. Use the "JSONB" type instead.',
-            );
-        }
-
         return $this->getClobTypeDeclarationSQL($column);
     }
 
@@ -879,7 +870,7 @@ private function buildCreateTableSQL(Table $table, bool $createForeignKeys): arr
         $columns = [];
 
         foreach ($table->getColumns() as $column) {
-            $columns[] = $this->columnToArray($column);
+            $columns[] = $column->toArray();
         }
 
         $sql = $this->_getCreateTableSQL($tableName, $columns, $parameters);
@@ -2140,17 +2131,6 @@ final public function escapeStringForLike(string $inputString, string $escapeCha
         return $sql;
     }
 
-    /**
-     * @return ColumnProperties An associative array with the name of the properties of the column being declared as
-     *                          array keys.
-     */
-    private function columnToArray(Column $column): array
-    {
-        return array_merge($column->toArray(), [
-            'version' => $column->hasPlatformOption('version') ? $column->getPlatformOption('version') : false,
-        ]);
-    }
-
     /** @internal */
     public function createSQLParser(): Parser
     {
@@ -2167,8 +2147,8 @@ protected function getLikeWildcardCharacters(): string
      */
     public function columnsEqual(Column $column1, Column $column2): bool
     {
-        $column1Array = $this->columnToArray($column1);
-        $column2Array = $this->columnToArray($column2);
+        $column1Array = $column1->toArray();
+        $column2Array = $column2->toArray();
 
         $name = UnqualifiedName::unquoted('dummy');
 

src/Platforms/DB2Platform.php

@@ -18,9 +18,7 @@
 use Doctrine\DBAL\SQL\Builder\DefaultSelectSQLBuilder;
 use Doctrine\DBAL\SQL\Builder\SelectSQLBuilder;
 use Doctrine\DBAL\TransactionIsolationLevel;
-use Doctrine\DBAL\Types\DateTimeType;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_merge;
 use function count;
@@ -174,16 +172,6 @@ public function getDateDiffExpression(string $date1, string $date2): string
      */
     public function getDateTimeTypeDeclarationSQL(array $column): string
     {
-        if (isset($column['version']) && $column['version'] === true) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6940',
-                'The "version" column platform option is deprecated.',
-            );
-
-            return 'TIMESTAMP(0) WITH DEFAULT';
-        }
-
         return 'TIMESTAMP(0)';
     }
 
@@ -498,18 +486,6 @@ protected function getDefaultValueDeclarationSQL(array $column): string
             return '';
         }
 
-        if (isset($column['version']) && $column['version'] === true) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6940',
-                'The "version" column platform option is deprecated.',
-            );
-
-            if ($column['type'] instanceof DateTimeType) {
-                $column['default'] = '1';
-            }
-        }
-
         return parent::getDefaultValueDeclarationSQL($column);
     }
 

src/Platforms/PostgreSQLPlatform.php

@@ -19,7 +19,6 @@
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\TransactionIsolationLevel;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\Deprecations\Deprecation;
 use UnexpectedValueException;
 
 use function array_merge;
@@ -262,7 +261,6 @@ public function getAlterTableSQL(TableDiff $diff): array
                 || $columnDiff->hasScaleChanged()
                 || $columnDiff->hasFixedChanged()
                 || $columnDiff->hasLengthChanged()
-                || $columnDiff->hasPlatformOptionsChanged()
             ) {
                 $type = $newColumn->getType();
 
@@ -723,7 +721,7 @@ protected function initializeDoctrineTypeMappings(): void
             'integer'          => Types::INTEGER,
             'interval'         => Types::STRING,
             'json'             => Types::JSON,
-            'jsonb'            => Types::JSON,
+            'jsonb'            => Types::JSONB,
             'money'            => Types::DECIMAL,
             'numeric'          => Types::DECIMAL,
             'serial'           => Types::INTEGER,
@@ -773,16 +771,6 @@ protected function supportsColumnCollation(): bool
      */
     public function getJsonTypeDeclarationSQL(array $column): string
     {
-        if (! empty($column['jsonb'])) {
-            Deprecation::trigger(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6939',
-                'The "jsonb" column platform option is deprecated. Use the "JSONB" type instead.',
-            );
-
-            return 'JSONB';
-        }
-
         return 'JSON';
     }
 

src/Schema/Column.php

@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Schema\Name\Parsers;
 use Doctrine\DBAL\Schema\Name\UnqualifiedName;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_merge;
 use function method_exists;
@@ -33,8 +32,6 @@
  *     charset?: ?string,
  *     collation?: ?string,
  *     default_constraint_name?: string,
- *     jsonb?: bool,
- *     version?: bool,
  * }
  */
 class Column extends AbstractNamedObject
@@ -160,14 +157,6 @@ public function setDefault(mixed $default): self
     /** @param PlatformOptions $platformOptions */
     public function setPlatformOptions(array $platformOptions): self
     {
-        if (isset($platformOptions['jsonb']) && $platformOptions['jsonb']) {
-            Deprecation::triggerIfCalledFromOutside(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6939',
-                'The "jsonb" column platform option is deprecated. Use the "JSONB" type instead.',
-            );
-        }
-
         $this->_platformOptions = $platformOptions;
 
         return $this;
@@ -176,14 +165,6 @@ public function setPlatformOptions(array $platformOptions): self
     /** @param key-of<PlatformOptions> $name */
     public function setPlatformOption(string $name, mixed $value): self
     {
-        if ($name === 'jsonb' && (bool) $value === true) {
-            Deprecation::triggerIfCalledFromOutside(
-                'doctrine/dbal',
-                'https://github.com/doctrine/dbal/pull/6939',
-                'The "jsonb" column platform option is deprecated. Use the "JSONB" type instead.',
-            );
-        }
-
         $this->_platformOptions[$name] = $value;
 
         return $this;

src/Schema/PostgreSQLSchemaManager.php

@@ -10,7 +10,6 @@
 use Doctrine\DBAL\Schema\ForeignKeyConstraint\ReferentialAction;
 use Doctrine\DBAL\Schema\Index\IndexType;
 use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
-use Doctrine\DBAL\Types\JsonType;
 use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
@@ -188,7 +187,6 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
         $precision = null;
         $scale     = 0;
         $fixed     = false;
-        $jsonb     = false;
 
         $dbType = $tableColumn['typname'];
         if (
@@ -231,8 +229,6 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
 
         if ($dbType === 'bpchar') {
             $fixed = true;
-        } elseif ($dbType === 'jsonb') {
-            $jsonb = true;
         }
 
         $options = [
@@ -255,10 +251,6 @@ protected function _getPortableTableColumnDefinition(array $tableColumn): Column
             $column->setPlatformOption('collation', $tableColumn['collation']);
         }
 
-        if ($column->getType() instanceof JsonType) {
-            $column->setPlatformOption('jsonb', $jsonb);
-        }
-
         return $column;
     }
 

tests/Functional/Schema/PostgreSQL/ComparatorTest.php

@@ -79,15 +79,15 @@ public function testPlatformOptionsChangedColumnComparison(): void
 
         $onlineTable = clone $table;
         $table->getColumn('test')
-            ->setPlatformOption('jsonb', true);
+            ->setType(Type::getType(Types::JSONB));
 
         $compareResult = $this->comparator->compareTables($onlineTable, $table);
         self::assertCount(1, $compareResult->getChangedColumns());
         self::assertCount(1, $compareResult->getModifiedColumns());
 
         $changedColumn = $compareResult->getChangedColumns()['test'];
 
-        self::assertTrue($changedColumn->hasPlatformOptionsChanged());
+        self::assertTrue($changedColumn->hasTypeChanged());
         self::assertEquals(1, $changedColumn->countChangedProperties());
     }
 

tests/Functional/Schema/PostgreSQLSchemaManagerTest.php

@@ -14,7 +14,7 @@
 use Doctrine\DBAL\Types\BlobType;
 use Doctrine\DBAL\Types\DecimalType;
 use Doctrine\DBAL\Types\IntegerType;
-use Doctrine\DBAL\Types\JsonType;
+use Doctrine\DBAL\Types\JsonbType;
 use Doctrine\DBAL\Types\TextType;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
@@ -323,13 +323,12 @@ public function testPartialIndexes(): void
     public function testJsonbColumn(): void
     {
         $table = new Table('test_jsonb');
-        $table->addColumn('foo', Types::JSON)->setPlatformOption('jsonb', true);
+        $table->addColumn('foo', Types::JSONB);
         $this->dropAndCreateTable($table);
 
         $columns = $this->schemaManager->listTableColumns('test_jsonb');
 
-        self::assertInstanceOf(JsonType::class, $columns['foo']->getType());
-        self::assertTrue($columns['foo']->getPlatformOption('jsonb'));
+        self::assertInstanceOf(JsonbType::class, $columns['foo']->getType());
     }
 
     public function testListNegativeColumnDefaultValue(): void

tests/Platforms/AbstractMySQLPlatformTestCase.php

@@ -177,8 +177,6 @@ public function testModifyLimitQueryWithEmptyOffset(): void
 
     public function testGetDateTimeTypeDeclarationSql(): void
     {
-        self::assertEquals('DATETIME', $this->platform->getDateTimeTypeDeclarationSQL(['version' => false]));
-        self::assertEquals('TIMESTAMP', $this->platform->getDateTimeTypeDeclarationSQL(['version' => true]));
         self::assertEquals('DATETIME', $this->platform->getDateTimeTypeDeclarationSQL([]));
     }
 

tests/Platforms/AbstractPlatformTestCase.php

@@ -29,7 +29,6 @@
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
-use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
@@ -40,8 +39,6 @@
 /** @template T of AbstractPlatform */
 abstract class AbstractPlatformTestCase extends TestCase
 {
-    use VerifyDeprecations;
-
     /** @var T */
     protected AbstractPlatform $platform;
 
@@ -549,10 +546,8 @@ public function testReturnsJsonTypeDeclarationSQL(): void
 
     public function testReturnsJsonbTypeDeclarationSQL(): void
     {
-        $this->expectDeprecationWithIdentifier('https://github.com/doctrine/dbal/pull/6939');
-
         self::assertSame(
-            $this->platform->getJsonTypeDeclarationSQL(['jsonb' => true]),
+            $this->platform->getJsonTypeDeclarationSQL([]),
             $this->platform->getJsonbTypeDeclarationSQL([]),
         );
     }

tests/Platforms/DB2PlatformTest.php

@@ -230,12 +230,6 @@ public function testGeneratesColumnTypesDeclarationSQL(): void
         self::assertEquals('SMALLINT', $this->platform->getBooleanTypeDeclarationSQL($fullColumnDef));
         self::assertEquals('CLOB(1M)', $this->platform->getClobTypeDeclarationSQL($fullColumnDef));
         self::assertEquals('DATE', $this->platform->getDateTypeDeclarationSQL($fullColumnDef));
-
-        self::assertEquals(
-            'TIMESTAMP(0) WITH DEFAULT',
-            $this->platform->getDateTimeTypeDeclarationSQL(['version' => true]),
-        );
-
         self::assertEquals('TIMESTAMP(0)', $this->platform->getDateTimeTypeDeclarationSQL($fullColumnDef));
         self::assertEquals('TIME', $this->platform->getTimeTypeDeclarationSQL($fullColumnDef));
     }