From d4ffdb2d5ac84639b7fc952097652dc9541d61dc Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Sun, 3 Jul 2022 15:10:20 -0700
Subject: [PATCH 1/2] Remove array and object column types

---
 UPGRADE.md                                    |  8 +++
 psalm.xml.dist                                | 20 ------
 src/Types/ArrayType.php                       | 61 -------------------
 src/Types/ObjectType.php                      | 60 ------------------
 src/Types/Type.php                            |  2 -
 tests/Functional/Schema/ColumnCommentTest.php |  2 +-
 tests/Functional/TypeConversionTest.php       | 49 +--------------
 tests/Platforms/SQLServerPlatformTestCase.php | 32 +++++-----
 tests/Types/ArrayTest.php                     | 58 ------------------
 tests/Types/ObjectTest.php                    | 58 ------------------
 10 files changed, 27 insertions(+), 323 deletions(-)
 delete mode 100644 src/Types/ArrayType.php
 delete mode 100644 src/Types/ObjectType.php
 delete mode 100644 tests/Types/ArrayTest.php
 delete mode 100644 tests/Types/ObjectTest.php

diff --git a/UPGRADE.md b/UPGRADE.md
index 48e3b97b948..48278ec2b5e 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -8,6 +8,14 @@ awareness about deprecated code.
 
 # Upgrade to 4.0
 
+## BC BREAK: removed `array` and `object` column types.
+
+The following classes and constants have been removed:
+- `ArrayType`,
+- `ObjectType`,
+- `Types::ARRAY`,
+- `Types::OBJECT`.
+
 ## BC BREAK: removed `Driver::getSchemaManager()`
 
 The `Driver::getSchemaManager()` method has been removed.
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 0ede3d1af6b..e38dc76ece8 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -32,26 +32,6 @@
                 <file name="src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php"/>
             </errorLevel>
         </ConflictingReferenceConstraint>
-        <DeprecatedClass>
-            <errorLevel type="suppress">
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedClass name="Doctrine\DBAL\Types\ArrayType"/>
-                <referencedClass name="Doctrine\DBAL\Types\ObjectType"/>
-            </errorLevel>
-        </DeprecatedClass>
-        <DeprecatedConstant>
-            <errorLevel type="suppress">
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <file name="src/Types/ArrayType.php"/>
-                <file name="src/Types/ObjectType.php"/>
-                <file name="src/Types/Type.php"/>
-                <file name="tests/Schema/ComparatorTest.php"/>
-            </errorLevel>
-        </DeprecatedConstant>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!--
diff --git a/src/Types/ArrayType.php b/src/Types/ArrayType.php
deleted file mode 100644
index d8d769cf427..00000000000
--- a/src/Types/ArrayType.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Types;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
-
-use function is_resource;
-use function restore_error_handler;
-use function serialize;
-use function set_error_handler;
-use function stream_get_contents;
-use function unserialize;
-
-/**
- * Type that maps a PHP array to a clob SQL type.
- *
- * @deprecated Use {@link JsonType} instead.
- */
-class ArrayType extends Type
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return $platform->getClobTypeDeclarationSQL($column);
-    }
-
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
-    {
-        // @todo 3.0 - $value === null check to save real NULL in database
-        return serialize($value);
-    }
-
-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $value = is_resource($value) ? stream_get_contents($value) : $value;
-
-        set_error_handler(static function (int $code, string $message) use ($value): bool {
-            throw ValueNotConvertible::new($value, 'array', $message);
-        });
-
-        try {
-            return unserialize($value);
-        } finally {
-            restore_error_handler();
-        }
-    }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
-    }
-}
diff --git a/src/Types/ObjectType.php b/src/Types/ObjectType.php
deleted file mode 100644
index 4ca2e015815..00000000000
--- a/src/Types/ObjectType.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Types;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
-
-use function is_resource;
-use function restore_error_handler;
-use function serialize;
-use function set_error_handler;
-use function stream_get_contents;
-use function unserialize;
-
-/**
- * Type that maps a PHP object to a clob SQL type.
- *
- * @deprecated Use {@link JsonType} instead.
- */
-class ObjectType extends Type
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
-    {
-        return $platform->getClobTypeDeclarationSQL($column);
-    }
-
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
-    {
-        return serialize($value);
-    }
-
-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
-    {
-        if ($value === null) {
-            return null;
-        }
-
-        $value = is_resource($value) ? stream_get_contents($value) : $value;
-
-        set_error_handler(static function (int $code, string $message) use ($value): bool {
-            throw ValueNotConvertible::new($value, 'object', $message);
-        });
-
-        try {
-            return unserialize($value);
-        } finally {
-            restore_error_handler();
-        }
-    }
-
-    public function requiresSQLCommentHint(AbstractPlatform $platform): bool
-    {
-        return true;
-    }
-}
diff --git a/src/Types/Type.php b/src/Types/Type.php
index 2e957c65773..77f918af0ec 100644
--- a/src/Types/Type.php
+++ b/src/Types/Type.php
@@ -21,7 +21,6 @@ abstract class Type
      * The map of supported doctrine mapping types.
      */
     private const BUILTIN_TYPES_MAP = [
-        Types::ARRAY                => ArrayType::class,
         Types::ASCII_STRING         => AsciiStringType::class,
         Types::BIGINT               => BigIntType::class,
         Types::BINARY               => BinaryType::class,
@@ -39,7 +38,6 @@ abstract class Type
         Types::GUID                 => GuidType::class,
         Types::INTEGER              => IntegerType::class,
         Types::JSON                 => JsonType::class,
-        Types::OBJECT               => ObjectType::class,
         Types::SIMPLE_ARRAY         => SimpleArrayType::class,
         Types::SMALLINT             => SmallIntType::class,
         Types::STRING               => StringType::class,
diff --git a/tests/Functional/Schema/ColumnCommentTest.php b/tests/Functional/Schema/ColumnCommentTest.php
index 116165096c0..22d85445f70 100644
--- a/tests/Functional/Schema/ColumnCommentTest.php
+++ b/tests/Functional/Schema/ColumnCommentTest.php
@@ -56,7 +56,7 @@ public static function columnProvider(): iterable
                     ['length' => 16],
                 ],
                 'not_commented' => [
-                    'array',
+                    'json',
                     [],
                 ],
             ] as $typeName => [$type, $typeOptions]
diff --git a/tests/Functional/TypeConversionTest.php b/tests/Functional/TypeConversionTest.php
index 2f40e52e756..0b4ed2fea32 100644
--- a/tests/Functional/TypeConversionTest.php
+++ b/tests/Functional/TypeConversionTest.php
@@ -9,7 +9,6 @@
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use Doctrine\DBAL\Tests\TestUtil;
 use Doctrine\DBAL\Types\Type;
-use stdClass;
 
 use function str_repeat;
 
@@ -33,9 +32,7 @@ protected function setUp(): void
         $table->addColumn('test_date', 'date', ['notnull' => false]);
         $table->addColumn('test_time', 'time', ['notnull' => false]);
         $table->addColumn('test_text', 'text', ['notnull' => false]);
-        $table->addColumn('test_array', 'array', ['notnull' => false]);
         $table->addColumn('test_json', 'json', ['notnull' => false]);
-        $table->addColumn('test_object', 'object', ['notnull' => false]);
         $table->addColumn('test_float', 'float', ['notnull' => false]);
         $table->addColumn('test_decimal', 'decimal', ['notnull' => false, 'scale' => 2, 'precision' => 10]);
         $table->setPrimaryKey(['id']);
@@ -135,51 +132,9 @@ public static function toStringProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider toArrayProvider
-     */
-    public function testIdempotentConversionToArray(string $type, mixed $originalValue): void
-    {
-        $dbValue = $this->processValue($type, $originalValue);
-
-        self::assertIsArray($dbValue);
-        self::assertEquals($originalValue, $dbValue);
-    }
-
-    /**
-     * @return mixed[][]
-     */
-    public static function toArrayProvider(): iterable
-    {
-        return [
-            'array' => ['array', ['foo' => 'bar']],
-            'json' => ['json', ['foo' => 'bar']],
-        ];
-    }
-
-    /**
-     * @dataProvider toObjectProvider
-     */
-    public function testIdempotentConversionToObject(string $type, mixed $originalValue): void
+    public function testIdempotentConversionToArray(): void
     {
-        $dbValue = $this->processValue($type, $originalValue);
-
-        self::assertIsObject($dbValue);
-        self::assertEquals($originalValue, $dbValue);
-    }
-
-    /**
-     * @return mixed[][]
-     */
-    public static function toObjectProvider(): iterable
-    {
-        $obj      = new stdClass();
-        $obj->foo = 'bar';
-        $obj->bar = 'baz';
-
-        return [
-            'object' => ['object', $obj],
-        ];
+        self::assertEquals(['foo' => 'bar'], $this->processValue('json', ['foo' => 'bar']));
     }
 
     /**
diff --git a/tests/Platforms/SQLServerPlatformTestCase.php b/tests/Platforms/SQLServerPlatformTestCase.php
index 10bde6d0d59..81be88aee40 100644
--- a/tests/Platforms/SQLServerPlatformTestCase.php
+++ b/tests/Platforms/SQLServerPlatformTestCase.php
@@ -67,7 +67,7 @@ public function getGenerateAlterTableSql(): array
             "sp_rename 'mytable', 'userlist'",
             "DECLARE @sql NVARCHAR(MAX) = N''; " .
             "SELECT @sql += N'EXEC sp_rename N''' + dc.name + ''', N''' " .
-            "+ REPLACE(dc.name, '6B2BD609', 'E2B58069') + ''', ''OBJECT'';' " .
+            "+ REPLACE(dc.name, '6B2BD609', 'E2B58069') + ''', ''json'';' " .
             'FROM sys.default_constraints dc ' .
             'JOIN sys.tables tbl ON dc.parent_object_id = tbl.object_id ' .
             "WHERE tbl.name = 'userlist';" .
@@ -756,8 +756,8 @@ public function testGeneratesCreateTableSQLWithColumnComments(): void
             ['comment' => 'Doctrine 0wnz comments for explicitly quoted columns!']
         );
         $table->addColumn('create', 'integer', ['comment' => 'Doctrine 0wnz comments for reserved keyword columns!']);
-        $table->addColumn('commented_type', 'object');
-        $table->addColumn('commented_type_with_comment', 'array', ['comment' => 'Doctrine array type.']);
+        $table->addColumn('commented_type', 'json');
+        $table->addColumn('commented_type_with_comment', 'json', ['comment' => 'Doctrine JSON type.']);
         $table->addColumn('comment_with_string_literal_char', 'string', [
             'length' => 255,
             'comment' => "O'Reilly",
@@ -806,9 +806,9 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
             ['comment' => 'Doctrine 0wnz comments for explicitly quoted columns!']
         );
         $table->addColumn('create', 'integer', ['comment' => 'Doctrine 0wnz comments for reserved keyword columns!']);
-        $table->addColumn('commented_type', 'object');
-        $table->addColumn('commented_type_with_comment', 'array', ['comment' => 'Doctrine array type.']);
-        $table->addColumn('comment_with_string_literal_quote_char', 'array', [
+        $table->addColumn('commented_type', 'json');
+        $table->addColumn('commented_type_with_comment', 'json', ['comment' => 'Doctrine JSON type.']);
+        $table->addColumn('comment_with_string_literal_quote_char', 'json', [
             'length' => 255,
             'comment' => "O'Reilly",
         ]);
@@ -836,10 +836,10 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
             = new Column('select', Type::getType('integer'), ['comment' => '666']);
 
         $tableDiff->addedColumns['added_commented_type']
-            = new Column('added_commented_type', Type::getType('object'));
+            = new Column('added_commented_type', Type::getType('json'));
 
         $tableDiff->addedColumns['added_commented_type_with_comment']
-            = new Column('added_commented_type_with_comment', Type::getType('array'), ['comment' => '666']);
+            = new Column('added_commented_type_with_comment', Type::getType('json'), ['comment' => '666']);
 
         $tableDiff->addedColumns['added_comment_with_string_literal_char']
             = new Column('added_comment_with_string_literal_char', Type::getType('string'), [
@@ -858,7 +858,7 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
         // Change type to custom type from empty string commented column.
         $tableDiff->changedColumns['comment_empty_string'] = new ColumnDiff(
             'comment_empty_string',
-            new Column('comment_empty_string', Type::getType('object')),
+            new Column('comment_empty_string', Type::getType('json')),
             ['type'],
             new Column('comment_empty_string', Type::getType('integer'), ['comment' => ''])
         );
@@ -882,7 +882,7 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
         // Change comment and change type to custom type from regular commented column.
         $tableDiff->changedColumns['`comment_quoted`'] = new ColumnDiff(
             '`comment_quoted`',
-            new Column('`comment_quoted`', Type::getType('array'), ['comment' => 'Doctrine array.']),
+            new Column('`comment_quoted`', Type::getType('json'), ['comment' => 'Doctrine JSON.']),
             ['comment', 'type'],
             new Column('`comment_quoted`', Type::getType('integer'), ['comment' => 'Doctrine 0wnz you!'])
         );
@@ -890,7 +890,7 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
         // Remove comment and change type to custom type from regular commented column.
         $tableDiff->changedColumns['create'] = new ColumnDiff(
             'create',
-            new Column('create', Type::getType('object')),
+            new Column('create', Type::getType('json')),
             ['comment', 'type'],
             new Column(
                 'create',
@@ -904,15 +904,15 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
             'commented_type',
             new Column('commented_type', Type::getType('integer'), ['comment' => 'foo']),
             ['comment', 'type'],
-            new Column('commented_type', Type::getType('object'))
+            new Column('commented_type', Type::getType('json'))
         );
 
         // Remove comment from commented custom type column.
         $tableDiff->changedColumns['commented_type_with_comment'] = new ColumnDiff(
             'commented_type_with_comment',
-            new Column('commented_type_with_comment', Type::getType('array')),
+            new Column('commented_type_with_comment', Type::getType('json')),
             ['comment'],
-            new Column('commented_type_with_comment', Type::getType('array'), ['comment' => 'Doctrine array type.'])
+            new Column('commented_type_with_comment', Type::getType('json'), ['comment' => 'Doctrine JSON type.'])
         );
 
         // Change comment from comment with string literal char column.
@@ -920,7 +920,7 @@ public function testGeneratesAlterTableSQLWithColumnComments(): void
             'comment_with_string_literal_char',
             new Column('comment_with_string_literal_char', Type::getType('string'), ['comment' => "'"]),
             ['comment'],
-            new Column('comment_with_string_literal_char', Type::getType('array'), ['comment' => "O'Reilly"])
+            new Column('comment_with_string_literal_char', Type::getType('json'), ['comment' => "O'Reilly"])
         );
 
         self::assertEquals(
@@ -1462,7 +1462,7 @@ protected function getQuotesTableIdentifiersInAlterTableSQL(): array
             "sp_rename '[foo]', 'table'",
             "DECLARE @sql NVARCHAR(MAX) = N''; " .
             "SELECT @sql += N'EXEC sp_rename N''' + dc.name + ''', " .
-            "N''' + REPLACE(dc.name, '8C736521', 'F6298F46') + ''', ''OBJECT'';' " .
+            "N''' + REPLACE(dc.name, '8C736521', 'F6298F46') + ''', ''json'';' " .
             'FROM sys.default_constraints dc JOIN sys.tables tbl ON dc.parent_object_id = tbl.object_id ' .
             "WHERE tbl.name = 'table';EXEC sp_executesql @sql",
             'ALTER TABLE [table] ADD CONSTRAINT fk_add FOREIGN KEY (fk3) REFERENCES fk_table (id)',
diff --git a/tests/Types/ArrayTest.php b/tests/Types/ArrayTest.php
deleted file mode 100644
index 6215ba34179..00000000000
--- a/tests/Types/ArrayTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Tests\Types;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ArrayType;
-use Doctrine\DBAL\Types\ConversionException;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-use function serialize;
-
-class ArrayTest extends TestCase
-{
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
-    private ArrayType $type;
-
-    protected function setUp(): void
-    {
-        $this->platform = $this->createMock(AbstractPlatform::class);
-        $this->type     = new ArrayType();
-    }
-
-    public function testArrayConvertsToDatabaseValue(): void
-    {
-        self::assertIsString($this->type->convertToDatabaseValue([], $this->platform));
-    }
-
-    public function testArrayConvertsToPHPValue(): void
-    {
-        self::assertIsArray($this->type->convertToPHPValue(serialize([]), $this->platform));
-    }
-
-    public function testConversionFailure(): void
-    {
-        $this->expectException(ConversionException::class);
-        $this->expectExceptionMessage(
-            'Could not convert database value to "array" as an error was triggered by the unserialization:'
-                . ' unserialize(): Error at offset 0 of 7 bytes'
-        );
-
-        $this->type->convertToPHPValue('abcdefg', $this->platform);
-    }
-
-    public function testNullConversion(): void
-    {
-        self::assertNull($this->type->convertToPHPValue(null, $this->platform));
-    }
-
-    public function testFalseConversion(): void
-    {
-        self::assertFalse($this->type->convertToPHPValue(serialize(false), $this->platform));
-    }
-}
diff --git a/tests/Types/ObjectTest.php b/tests/Types/ObjectTest.php
deleted file mode 100644
index f98d025189e..00000000000
--- a/tests/Types/ObjectTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Doctrine\DBAL\Tests\Types;
-
-use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Types\ConversionException;
-use Doctrine\DBAL\Types\ObjectType;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-use stdClass;
-
-use function serialize;
-
-class ObjectTest extends TestCase
-{
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
-    private ObjectType $type;
-
-    protected function setUp(): void
-    {
-        $this->platform = $this->createMock(AbstractPlatform::class);
-        $this->type     = new ObjectType();
-    }
-
-    public function testObjectConvertsToDatabaseValue(): void
-    {
-        self::assertIsString($this->type->convertToDatabaseValue(new stdClass(), $this->platform));
-    }
-
-    public function testObjectConvertsToPHPValue(): void
-    {
-        self::assertIsObject($this->type->convertToPHPValue(serialize(new stdClass()), $this->platform));
-    }
-
-    public function testConversionFailure(): void
-    {
-        $this->expectException(ConversionException::class);
-        $this->expectExceptionMessage(
-            'Could not convert database value to "object" as an error was triggered by the unserialization:'
-                . ' unserialize(): Error at offset 0 of 7 bytes'
-        );
-        $this->type->convertToPHPValue('abcdefg', $this->platform);
-    }
-
-    public function testNullConversion(): void
-    {
-        self::assertNull($this->type->convertToPHPValue(null, $this->platform));
-    }
-
-    public function testFalseConversion(): void
-    {
-        self::assertFalse($this->type->convertToPHPValue(serialize(false), $this->platform));
-    }
-}

From 7a9a6c1b634c74c86be6d58c3bc48f50c0976333 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Sun, 3 Jul 2022 15:21:22 -0700
Subject: [PATCH 2/2] Remove custom schema options

---
 UPGRADE.md                      | 11 +++++
 psalm.xml.dist                  | 15 ------
 src/Schema/Column.php           | 84 +--------------------------------
 src/Schema/Comparator.php       | 13 -----
 tests/Schema/ColumnTest.php     |  7 ---
 tests/Schema/ComparatorTest.php | 30 ------------
 6 files changed, 12 insertions(+), 148 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 48278ec2b5e..53103aca2dc 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -8,6 +8,17 @@ awareness about deprecated code.
 
 # Upgrade to 4.0
 
+## BC BREAK: removed support for custom schema options.
+
+The following `Column` class properties and methods have been removed:
+
+- `$_customSchemaOptions`,
+- `setCustomSchemaOption()`,
+- `hasCustomSchemaOption()`,
+- `getCustomSchemaOption()`,
+- `setCustomSchemaOptions()`,
+- `getCustomSchemaOptions()`.
+
 ## BC BREAK: removed `array` and `object` column types.
 
 The following classes and constants have been removed:
diff --git a/psalm.xml.dist b/psalm.xml.dist
index e38dc76ece8..0cd277d5ace 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -39,23 +39,8 @@
                     See https://github.com/doctrine/dbal/pull/4317
                 -->
                 <file name="tests/Functional/LegacyAPITest.php"/>
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedMethod name="Doctrine\DBAL\Schema\Column::getCustomSchemaOption"/>
-                <referencedMethod name="Doctrine\DBAL\Schema\Column::getCustomSchemaOptions"/>
-                <referencedMethod name="Doctrine\DBAL\Schema\Column::hasCustomSchemaOption"/>
-                <referencedMethod name="Doctrine\DBAL\Schema\Column::setCustomSchemaOption"/>
             </errorLevel>
         </DeprecatedMethod>
-        <DeprecatedProperty>
-            <errorLevel type="suppress">
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedProperty name="Doctrine\DBAL\Schema\Column::$_customSchemaOptions"/>
-            </errorLevel>
-        </DeprecatedProperty>
         <DocblockTypeContradiction>
             <errorLevel type="suppress">
                 <!--
diff --git a/src/Schema/Column.php b/src/Schema/Column.php
index f9580b159d0..92ba688a52c 100644
--- a/src/Schema/Column.php
+++ b/src/Schema/Column.php
@@ -6,7 +6,6 @@
 
 use Doctrine\DBAL\Schema\Exception\UnknownColumnOption;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_merge;
 use function method_exists;
@@ -41,9 +40,6 @@ class Column extends AbstractAsset
 
     protected string $_comment = '';
 
-    /** @var array<string, mixed> */
-    protected array $_customSchemaOptions = [];
-
     /**
      * Creates a new Column.
      *
@@ -245,84 +241,6 @@ public function getComment(): string
         return $this->_comment;
     }
 
-    /**
-     * @deprecated Use {@link setPlatformOption()} instead
-     */
-    public function setCustomSchemaOption(string $name, mixed $value): self
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5476',
-            'Column::setCustomSchemaOption() is deprecated. Use setPlatformOption() instead.'
-        );
-
-        $this->_customSchemaOptions[$name] = $value;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated Use {@link hasPlatformOption()} instead
-     */
-    public function hasCustomSchemaOption(string $name): bool
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5476',
-            'Column::hasCustomSchemaOption() is deprecated. Use hasPlatformOption() instead.'
-        );
-
-        return isset($this->_customSchemaOptions[$name]);
-    }
-
-    /**
-     * @deprecated Use {@link getPlatformOption()} instead
-     */
-    public function getCustomSchemaOption(string $name): mixed
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5476',
-            'Column::getCustomSchemaOption() is deprecated. Use getPlatformOption() instead.'
-        );
-
-        return $this->_customSchemaOptions[$name];
-    }
-
-    /**
-     * @deprecated Use {@link setPlatformOptions()} instead
-     *
-     * @param array<string, mixed> $customSchemaOptions
-     */
-    public function setCustomSchemaOptions(array $customSchemaOptions): self
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5476',
-            'Column::setCustomSchemaOptions() is deprecated. Use setPlatformOptions() instead.'
-        );
-
-        $this->_customSchemaOptions = $customSchemaOptions;
-
-        return $this;
-    }
-
-    /**
-     * @deprecated Use {@link getPlatformOptions()} instead
-     *
-     * @return array<string, mixed>
-     */
-    public function getCustomSchemaOptions(): array
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5476',
-            'Column::getCustomSchemaOptions() is deprecated. Use getPlatformOptions() instead.'
-        );
-
-        return $this->_customSchemaOptions;
-    }
-
     /**
      * @return array<string, mixed>
      */
@@ -341,6 +259,6 @@ public function toArray(): array
             'autoincrement' => $this->_autoincrement,
             'columnDefinition' => $this->_columnDefinition,
             'comment' => $this->_comment,
-        ], $this->_platformOptions, $this->_customSchemaOptions);
+        ], $this->_platformOptions);
     }
 }
diff --git a/src/Schema/Comparator.php b/src/Schema/Comparator.php
index 6ee2c10d68b..2338f03e768 100644
--- a/src/Schema/Comparator.php
+++ b/src/Schema/Comparator.php
@@ -9,10 +9,8 @@
 use Doctrine\DBAL\Types;
 
 use function array_intersect_key;
-use function array_key_exists;
 use function array_keys;
 use function array_map;
-use function array_merge;
 use function array_unique;
 use function assert;
 use function count;
@@ -497,17 +495,6 @@ public function diffColumn(Column $column1, Column $column2): array
             $changedProperties[] = 'comment';
         }
 
-        $customOptions1 = $column1->getCustomSchemaOptions();
-        $customOptions2 = $column2->getCustomSchemaOptions();
-
-        foreach (array_merge(array_keys($customOptions1), array_keys($customOptions2)) as $key) {
-            if (! array_key_exists($key, $properties1) || ! array_key_exists($key, $properties2)) {
-                $changedProperties[] = $key;
-            } elseif ($properties1[$key] !== $properties2[$key]) {
-                $changedProperties[] = $key;
-            }
-        }
-
         $platformOptions1 = $column1->getPlatformOptions();
         $platformOptions2 = $column2->getPlatformOptions();
 
diff --git a/tests/Schema/ColumnTest.php b/tests/Schema/ColumnTest.php
index 05472ca2598..418696725ac 100644
--- a/tests/Schema/ColumnTest.php
+++ b/tests/Schema/ColumnTest.php
@@ -34,11 +34,6 @@ public function testGet(): void
         self::assertTrue($column->hasPlatformOption('foo'));
         self::assertEquals('bar', $column->getPlatformOption('foo'));
         self::assertFalse($column->hasPlatformOption('bar'));
-
-        self::assertEquals(['bar' => 'baz'], $column->getCustomSchemaOptions());
-        self::assertTrue($column->hasCustomSchemaOption('bar'));
-        self::assertEquals('baz', $column->getCustomSchemaOption('bar'));
-        self::assertFalse($column->hasCustomSchemaOption('foo'));
     }
 
     public function testToArray(): void
@@ -57,7 +52,6 @@ public function testToArray(): void
             'columnDefinition' => null,
             'comment' => '',
             'foo' => 'bar',
-            'bar' => 'baz',
         ];
 
         self::assertSame($expected, $this->createColumn()->toArray());
@@ -94,7 +88,6 @@ public function createColumn(): Column
             'fixed' => true,
             'default' => 'baz',
             'platformOptions' => ['foo' => 'bar'],
-            'customSchemaOptions' => ['bar' => 'baz'],
         ];
 
         $string = Type::getType('string');
diff --git a/tests/Schema/ComparatorTest.php b/tests/Schema/ComparatorTest.php
index a65ebdfc045..e22378db88d 100644
--- a/tests/Schema/ComparatorTest.php
+++ b/tests/Schema/ComparatorTest.php
@@ -226,21 +226,6 @@ public function testCompareColumnsOverriddenType(): void
         self::assertEquals([], $this->comparator->diffColumn($column1, $column2));
     }
 
-    public function testCompareChangedColumnsChangeCustomSchemaOption(): void
-    {
-        $column1 = new Column('charcolumn1', Type::getType('string'));
-        $column2 = new Column('charcolumn1', Type::getType('string'));
-
-        $column1->setCustomSchemaOption('foo', 'bar');
-        $column2->setCustomSchemaOption('foo', 'bar');
-
-        $column1->setCustomSchemaOption('foo1', 'bar1');
-        $column2->setCustomSchemaOption('foo2', 'bar2');
-
-        self::assertEquals(['foo1', 'foo2'], $this->comparator->diffColumn($column1, $column2));
-        self::assertEquals([], $this->comparator->diffColumn($column1, $column1));
-    }
-
     public function testCompareChangeColumnsMultipleNewColumnsRename(): void
     {
         $tableA = new Table('foo');
@@ -1116,21 +1101,6 @@ public function testDiffColumnPlatformOptions(): void
         self::assertEquals([], $this->comparator->diffColumn($column4, $column1));
     }
 
-    public function testComplexDiffColumn(): void
-    {
-        $column1 = new Column('foo', Type::getType('string'), [
-            'platformOptions' => ['foo' => 'foo'],
-            'customSchemaOptions' => ['foo' => 'bar'],
-        ]);
-
-        $column2 = new Column('foo', Type::getType('string'), [
-            'platformOptions' => ['foo' => 'bar'],
-        ]);
-
-        self::assertEquals([], $this->comparator->diffColumn($column1, $column2));
-        self::assertEquals([], $this->comparator->diffColumn($column2, $column1));
-    }
-
     public function testComparesNamespaces(): void
     {
         $fromSchema = $this->getMockBuilder(Schema::class)