Merge branch '4.3.x' into 5.0.x

Author: morozov

.appveyor.yml

@@ -27,11 +27,11 @@ environment:
   - db: mssql
     driver: sqlsrv
     db_version: sql2017
-    php: 8.1
+    php: 8.3
   - db: mssql
     driver: pdo_sqlsrv
     db_version: sql2017
-    php: 8.1
+    php: 8.3
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;C:\tools\composer;%PATH%
@@ -64,18 +64,19 @@ install:
           Add-Content php.ini "`n extension=php_sqlite3.dll"
           Add-Content php.ini "`n extension=php_curl.dll"
 
-          $DLLVersion = "5.10.0"
+          $DLLVersion = "5.12.0"
+          $VSVersion = "vs16"
           cd c:\tools\php\ext
-          $source = "https://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip"
-          $destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip"
+          $source = "https://downloads.php.net/~windows/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip"
+          $destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip"
           Invoke-WebRequest $source -OutFile $destination
-          7z x -y php_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip > $null
-          $source = "https://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip"
-          $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip"
+          7z x -y php_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip > $null
+          $source = "https://downloads.php.net/~windows/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip"
+          $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip"
           Invoke-WebRequest $source -OutFile $destination
-          7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-vs16-x64.zip > $null
+          7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-x64.zip > $null
           $DLLVersion = (Invoke-WebRequest "https://pecl.php.net/rest/r/pcov/stable.txt").Content
-          Invoke-WebRequest https://downloads.php.net/~windows/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-$($env:php)-nts-vs16-$($env:platform).zip -OutFile pcov.zip
+          Invoke-WebRequest https://downloads.php.net/~windows/pecl/releases/pcov/$($DLLVersion)/php_pcov-$($DLLVersion)-$($env:php)-nts-$($VSVersion)-$($env:platform).zip -OutFile pcov.zip
           7z x -y pcov.zip > $null
           Remove-Item c:\tools\php\* -include .zip
           cd c:\tools\php

.github/workflows/continuous-integration.yml

@@ -46,7 +46,7 @@ jobs:
           - "pdo_sqlite"
         include:
           - os: "ubuntu-20.04"
-            php-version: "8.1"
+            php-version: "8.3"
             dependencies: "lowest"
             extension: "pdo_sqlite"
           - os: "ubuntu-22.04"
@@ -106,7 +106,7 @@ jobs:
           - "21"
           - "23"
         include:
-          - php-version: "8.1"
+          - php-version: "8.3"
             oracle-version: "23"
           - php-version: "8.5"
             oracle-version: "23"
@@ -166,7 +166,7 @@ jobs:
           - "21"
           - "23"
         include:
-          - php-version: "8.1"
+          - php-version: "8.3"
             oracle-version: "23"
           - php-version: "8.5"
             oracle-version: "23"
@@ -231,10 +231,10 @@ jobs:
           - "pgsql"
           - "pdo_pgsql"
         include:
-          - php-version: "8.1"
+          - php-version: "8.3"
             postgres-version: "17"
             extension: "pgsql"
-          - php-version: "8.1"
+          - php-version: "8.3"
             postgres-version: "17"
             extension: "pdo_pgsql"
           - php-version: "8.5"
@@ -308,10 +308,10 @@ jobs:
           - "mysqli"
           - "pdo_mysql"
         include:
-          - php-version: "8.1"
+          - php-version: "8.3"
             mariadb-version: "11.4"
             extension: "mysqli"
-          - php-version: "8.1"
+          - php-version: "8.3"
             mariadb-version: "11.4"
             extension: "pdo_mysql"
           - php-version: "8.5"
@@ -381,10 +381,10 @@ jobs:
           - ""
         include:
           - config-file-suffix: "-tls"
-            php-version: "8.1"
+            php-version: "8.3"
             mysql-version: "9.1"
             extension: "mysqli"
-          - php-version: "8.1"
+          - php-version: "8.3"
             mysql-version: "9.1"
             extension: "mysqli"
           - php-version: "8.5"
@@ -447,7 +447,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.3"
           - "8.4"
           - "8.5"
         extension:
@@ -457,10 +457,10 @@ jobs:
           - "Latin1_General_100_CI_AS_SC_UTF8"
         include:
           - collation: "Latin1_General_100_CS_AS_SC_UTF8"
-            php-version: "8.1"
+            php-version: "8.3"
             extension: "sqlsrv"
           - collation: "Latin1_General_100_CS_AS_SC_UTF8"
-            php-version: "8.1"
+            php-version: "8.3"
             extension: "pdo_sqlsrv"
 
     services:
@@ -514,7 +514,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.3"
           - "8.4"
           - "8.5"
 
@@ -582,7 +582,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.1"
+          - "8.3"
 
     steps:
       - name: "Checkout"

UPGRADE.md

@@ -243,6 +243,34 @@ all drivers and middleware.
 
 # Upgrade to 4.3
 
+## Deprecated `Index` methods, properties and behavior
+
+The following `Index` methods and properties have been deprecated:
+
+- `Index::getColumns()`, `Index::getQuotedColumns()`, `Index::getUnquotedColumns()`,
+  `Index::$_columns` – use `Index::getIndexedColumns()` instead.
+- `Index::isSimpleIndex()`, `Index::isUnique()`, `Index::$_isUnique` – use `Index::getType()` and compare with
+  `IndexType::REGULAR` or `IndexType::UNIQUE` instead.
+- `Index::addFlag()`, `Index::removeFlag()`, `Index::getFlags()`, `Index::hasFlag()`, `Index::$_flags` – use
+  `IndexEditor::setType()`, `Index::getType()`, `IndexEditor::setIsClustered()` and `Index::isClustered()` instead.
+- `Index::getOption()`, `Index::hasOption()` and `Index::getOptions()` – use `Index::getIndexedColumns()` and
+  `Index::getPredicate()` instead.
+- `Index::overrules()`, `Index::hasColumnAtPosition()` – no replacement provided.
+- `AbstractPlatform::supportsColumnLengthIndexes()` – no replacement provided.
+
+Additionally,
+1. Instantiation of an index without columns is deprecated.
+2. The `Index::spansColumns()` method has been marked as internal.
+3. Passing an empty string as partial index predicate has been deprecated.
+4. The `Index` constructor has been marked as internal. Use `Index::editor()` to instantiate an editor and
+   `IndexEditor::create()` to create an index.
+
+The following conflicting index configurations have been deprecated:
+1. Spatial index with column lengths specified.
+2. Clustered fulltext or spatial index.
+3. Partial fulltext or spatial index.
+4. Clustered partial index.
+
 ## Deprecated features related to primary key constraints
 
 1. The `AbstractPlatform::getCreatePrimaryKeySQL()` method has been deprecated. Use the schema manager to create and
@@ -279,9 +307,12 @@ of the primary key constraint is deprecated. Instead, drop the auto-increment at
 Passing a non-empty `$modifiedIndexes` value to the `TableDiff` constructor is deprecated. Instead, pass dropped
 indexes via `$droppedIndexes` and added indexes via `$addedIndexes`.
 
-The `TableDiff::getModifiedIndexes()` method has been deprecated. The old version of the index is included in the return
-value of `TableDiff::getDroppedIndexes()`, the new version is included in the return value of
-`TableDiff::getAddedIndexes()`.
+Detection of modified indexes is deprecated. Please disable it by configuring the comparator using
+`ComparatorConfig::withReportModifiedIndexes(false)`. With this configuration, the old version of the index will be
+included in the return value of `TableDiff::getDroppedIndexes()`, and the new version will be included in the return
+value of `TableDiff::getAddedIndexes()`.
+
+The `TableDiff::getModifiedIndexes()` method has been deprecated.
 
 ## Deprecated handling of modified foreign keys in `TableDiff`
 
@@ -364,7 +395,7 @@ the `Schema` class itself.
 
 ## Deprecated `ForeignKeyConstraint` methods, properties and behavior
 
-The following `ForeignKeyConstraint` methods and property have been deprecated:
+The following `ForeignKeyConstraint` methods and properties have been deprecated:
 
 - `ForeignKeyConstraint::getForeignTableName()`, `ForeignKeyConstraint::getQuotedForeignTableName()`,
   `ForeignKeyConstraint::getUnqualifiedForeignTableName()`, `ForeignKeyConstraint::$_foreignTableName` – use

composer.json

@@ -31,7 +31,7 @@
         {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "doctrine/deprecations": "^0.5.3|^1",
         "psr/cache": "^1|^2|^3",
         "psr/log": "^1|^2|^3"
@@ -41,9 +41,9 @@
         "fig/log-test": "^1",
         "jetbrains/phpstorm-stubs": "2023.2",
         "phpstan/phpstan": "2.1.1",
-        "phpstan/phpstan-phpunit": "2.0.3",
+        "phpstan/phpstan-phpunit": "2.0.6",
         "phpstan/phpstan-strict-rules": "^2",
-        "phpunit/phpunit": "10.5.39",
+        "phpunit/phpunit": "11.5.15",
         "slevomat/coding-standard": "8.13.1",
         "squizlabs/php_codesniffer": "3.10.2",
         "symfony/cache": "^6.3.8|^7.0",

phpcs.xml.dist

@@ -12,7 +12,7 @@
     <!-- Show progress of the run and show sniff names -->
     <arg value="ps"/>
 
-    <config name="php_version" value="80100"/>
+    <config name="php_version" value="80300"/>
 
     <file>src</file>
     <file>tests</file>

src/Configuration.php

@@ -134,17 +134,12 @@ public function setSchemaManagerFactory(SchemaManagerFactory $schemaManagerFacto
         return $this;
     }
 
-    /** @return true */
     public function getDisableTypeComments(): bool
     {
         return true;
     }
 
-    /**
-     * @param true $disableTypeComments
-     *
-     * @return $this
-     */
+    /** @return $this */
     public function setDisableTypeComments(bool $disableTypeComments): self
     {
         if (! $disableTypeComments) {

src/Driver/PgSQL/Exception/UnexpectedValue.php

@@ -20,8 +20,7 @@ public static function new(string $value, string $type): self
         ));
     }
 
-    /** @return null */
-    public function getSQLState(): string|null
+    public function getSQLState(): null
     {
         return null;
     }

src/Platforms/AbstractMySQLPlatform.php

@@ -16,6 +16,7 @@
 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;
@@ -663,8 +664,16 @@ public function getDefaultTransactionIsolationLevel(): TransactionIsolationLevel
         return TransactionIsolationLevel::REPEATABLE_READ;
     }
 
+    /** @deprecated */
     public function supportsColumnLengthIndexes(): bool
     {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6886',
+            '%s is deprecated.',
+            __METHOD__,
+        );
+
         return true;
     }
 

src/Platforms/AbstractPlatform.php

@@ -44,6 +44,7 @@
 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;
@@ -1850,9 +1851,18 @@ protected function supportsPartialIndexes(): bool
 
     /**
      * Whether the platform supports indexes with column length definitions.
+     *
+     * @deprecated
      */
     public function supportsColumnLengthIndexes(): bool
     {
+        Deprecation::triggerIfCalledFromOutside(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/6886',
+            '%s is deprecated.',
+            __METHOD__,
+        );
+
         return false;
     }
 

src/Platforms/SQLitePlatform.php

@@ -39,7 +39,6 @@
 use function strpos;
 use function strtolower;
 use function substr;
-use function trim;
 
 /**
  * The SQLitePlatform class describes the specifics and dialects of the SQLite
@@ -292,9 +291,7 @@ protected function _getCreateTableSQL(OptionallyQualifiedName $tableName, array
 
         $tableComment = '';
         if (isset($parameters['comment'])) {
-            $comment = trim($parameters['comment'], " '");
-
-            $tableComment = $this->getInlineTableCommentSQL($comment);
+            $tableComment = $this->getInlineTableCommentSQL($parameters['comment']);
         }
 
         $query = [