Merge branch '3.5.x' into 4.0.x

Author: morozov

UPGRADE.md

@@ -778,6 +778,25 @@ The following methods have been removed.
 
 # Upgrade to 3.5
 
+## Deprecated `SchemaException` error codes.
+
+Relying on the error code of `SchemaException` is deprecated. In order to handle a specific type of exception,
+catch the corresponding exception class instead.
+
+| Error Code                  | Class                          |
+|-----------------------------|--------------------------------|
+| `TABLE_DOESNT_EXIST`        | `TableDoesNotExist`            |
+| `TABLE_ALREADY_EXISTS`      | `TableAlreadyExists`           |
+| `COLUMN_DOESNT_EXIST`       | `ColumnDoesNotExist`           |
+| `COLUMN_ALREADY_EXISTS`     | `ColumnAlreadyExists`          |
+| `INDEX_DOESNT_EXIST`        | `IndexDoesNotExist`            |
+| `INDEX_ALREADY_EXISTS`      | `IndexAlreadyExists`           |
+| `SEQUENCE_DOENST_EXIST`     | `SequenceDoesNotExist`         |
+| `SEQUENCE_ALREADY_EXISTS`   | `SequenceAlreadyExists`        |
+| `FOREIGNKEY_DOESNT_EXIST`   | `ForeignKeyDoesNotExist`       |
+| `CONSTRAINT_DOESNT_EXIST`   | `UniqueConstraintDoesNotExist` |
+| `NAMESPACE_ALREADY_EXISTS`  | `NamespaceAlreadyExists`       |
+
 ## Deprecated fallback connection used to determine the database platform.
 
 Relying on a fallback connection used to determine the database platform while connecting to a non-existing database

psalm.xml.dist

@@ -32,6 +32,14 @@
                 <file name="src/Driver/OCI8/ConvertPositionalToNamedPlaceholders.php"/>
             </errorLevel>
         </ConflictingReferenceConstraint>
+        <DeprecatedConstant>
+            <errorLevel type="suppress">
+            <!--
+                    TODO: remove in 4.0.0
+                -->
+                <directory name="src/Schema/Exception"/>
+            </errorLevel>
+        </DeprecatedConstant>
         <DeprecatedMethod>
             <errorLevel type="suppress">
                 <!--

src/Schema/SchemaException.php

@@ -9,16 +9,39 @@
 /** @psalm-immutable */
 class SchemaException extends \Exception implements Exception
 {
-    public const TABLE_DOESNT_EXIST       = 10;
-    public const TABLE_ALREADY_EXISTS     = 20;
-    public const COLUMN_DOESNT_EXIST      = 30;
-    public const COLUMN_ALREADY_EXISTS    = 40;
-    public const INDEX_DOESNT_EXIST       = 50;
-    public const INDEX_ALREADY_EXISTS     = 60;
-    public const SEQUENCE_DOENST_EXIST    = 70;
-    public const SEQUENCE_ALREADY_EXISTS  = 80;
-    public const INDEX_INVALID_NAME       = 90;
-    public const FOREIGNKEY_DOESNT_EXIST  = 100;
-    public const CONSTRAINT_DOESNT_EXIST  = 110;
+    /** @deprecated Use {@see TableDoesNotExist} instead. */
+    public const TABLE_DOESNT_EXIST = 10;
+
+    /** @deprecated Use {@see TableAlreadyExists} instead. */
+    public const TABLE_ALREADY_EXISTS = 20;
+
+    /** @deprecated Use {@see ColumnDoesNotExist} instead. */
+    public const COLUMN_DOESNT_EXIST = 30;
+
+    /** @deprecated Use {@see ColumnAlreadyExists} instead. */
+    public const COLUMN_ALREADY_EXISTS = 40;
+
+    /** @deprecated Use {@see IndexDoesNotExist} instead. */
+    public const INDEX_DOESNT_EXIST = 50;
+
+    /** @deprecated Use {@see IndexAlreadyExists} instead. */
+    public const INDEX_ALREADY_EXISTS = 60;
+
+    /** @deprecated Use {@see SequenceDoesNotExist} instead. */
+    public const SEQUENCE_DOENST_EXIST = 70;
+
+    /** @deprecated Use {@see SequenceAlreadyExists} instead. */
+    public const SEQUENCE_ALREADY_EXISTS = 80;
+
+    /** @deprecated Use {@see IndexNameInvalid} instead. */
+    public const INDEX_INVALID_NAME = 90;
+
+    /** @deprecated Use {@see ForeignKeyDoesNotExist} instead. */
+    public const FOREIGNKEY_DOESNT_EXIST = 100;
+
+    /** @deprecated Use {@see UniqueConstraintDoesNotExist} instead. */
+    public const CONSTRAINT_DOESNT_EXIST = 110;
+
+    /** @deprecated Use {@see NamespaceAlreadyExists} instead. */
     public const NAMESPACE_ALREADY_EXISTS = 120;
 }