Merge branch '2.10'

lib/Doctrine/DBAL/Driver/PDOStatement.php

@@ -206,7 +206,7 @@ class PDOStatement implements IteratorAggregate, Statement
         if (! isset(self::PARAM_TYPE_MAP[$type])) {
             // TODO: next major: throw an exception
             @trigger_error(sprintf(
-                'Using a PDO parameter type (%d given) is deprecated and will cause an error in Doctrine 3.0.',
+                'Using a PDO parameter type (%d given) is deprecated and will cause an error in Doctrine DBAL 3.0.',
                 $type
             ), E_USER_DEPRECATED);
 
@@ -227,7 +227,7 @@ class PDOStatement implements IteratorAggregate, Statement
             // TODO: next major: throw an exception
             @trigger_error(sprintf(
                 'Using a PDO fetch mode or their combination (%d given)' .
-                ' is deprecated and will cause an error in Doctrine 3.0.',
+                ' is deprecated and will cause an error in Doctrine DBAL 3.0.',
                 $fetchMode
             ), E_USER_DEPRECATED);
 

lib/Doctrine/DBAL/Schema/Column.php

@@ -78,7 +78,7 @@ class Column extends AbstractAsset
                 // next major: throw an exception
                 @trigger_error(sprintf(
                     'The "%s" column option is not supported,' .
-                    ' setting it is deprecated and will cause an error in Doctrine 3.0',
+                    ' setting it is deprecated and will cause an error in Doctrine DBAL 3.0',
                     $name
                 ), E_USER_DEPRECATED);
 

lib/Doctrine/DBAL/Types/Type.php

@@ -17,76 +17,76 @@ use function get_class;
  */
 abstract class Type
 {
-    /** @deprecated Use {@see DefaultTypes::BIGINT} instead. */
+    /** @deprecated Use {@see Types::BIGINT} instead. */
     public const BIGINT = Types::BIGINT;
 
-    /** @deprecated Use {@see DefaultTypes::BINARY} instead. */
+    /** @deprecated Use {@see Types::BINARY} instead. */
     public const BINARY = Types::BINARY;
 
-    /** @deprecated Use {@see DefaultTypes::BLOB} instead. */
+    /** @deprecated Use {@see Types::BLOB} instead. */
     public const BLOB = Types::BLOB;
 
-    /** @deprecated Use {@see DefaultTypes::BOOLEAN} instead. */
+    /** @deprecated Use {@see Types::BOOLEAN} instead. */
     public const BOOLEAN = Types::BOOLEAN;
 
-    /** @deprecated Use {@see DefaultTypes::DATE_MUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATE_MUTABLE} instead. */
     public const DATE = Types::DATE_MUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DATE_IMMUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATE_IMMUTABLE} instead. */
     public const DATE_IMMUTABLE = Types::DATE_IMMUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DATEINTERVAL} instead. */
+    /** @deprecated Use {@see Types::DATEINTERVAL} instead. */
     public const DATEINTERVAL = Types::DATEINTERVAL;
 
-    /** @deprecated Use {@see DefaultTypes::DATETIME_MUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATETIME_MUTABLE} instead. */
     public const DATETIME = Types::DATETIME_MUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DATETIME_IMMUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATETIME_IMMUTABLE} instead. */
     public const DATETIME_IMMUTABLE = Types::DATETIME_IMMUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DATETIMETZ_MUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATETIMETZ_MUTABLE} instead. */
     public const DATETIMETZ = Types::DATETIMETZ_MUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DATETIMETZ_IMMUTABLE} instead. */
+    /** @deprecated Use {@see Types::DATETIMETZ_IMMUTABLE} instead. */
     public const DATETIMETZ_IMMUTABLE = Types::DATETIMETZ_IMMUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::DECIMAL} instead. */
+    /** @deprecated Use {@see Types::DECIMAL} instead. */
     public const DECIMAL = Types::DECIMAL;
 
-    /** @deprecated Use {@see DefaultTypes::FLOAT} instead. */
+    /** @deprecated Use {@see Types::FLOAT} instead. */
     public const FLOAT = Types::FLOAT;
 
-    /** @deprecated Use {@see DefaultTypes::GUID} instead. */
+    /** @deprecated Use {@see Types::GUID} instead. */
     public const GUID = Types::GUID;
 
-    /** @deprecated Use {@see DefaultTypes::INTEGER} instead. */
+    /** @deprecated Use {@see Types::INTEGER} instead. */
     public const INTEGER = Types::INTEGER;
 
-    /** @deprecated Use {@see DefaultTypes::JSON} instead. */
+    /** @deprecated Use {@see Types::JSON} instead. */
     public const JSON = Types::JSON;
 
-    /** @deprecated Use {@see DefaultTypes::OBJECT} instead. */
+    /** @deprecated Use {@see Types::OBJECT} instead. */
     public const OBJECT = Types::OBJECT;
 
-    /** @deprecated Use {@see DefaultTypes::SIMPLE_ARRAY} instead. */
+    /** @deprecated Use {@see Types::SIMPLE_ARRAY} instead. */
     public const SIMPLE_ARRAY = Types::SIMPLE_ARRAY;
 
-    /** @deprecated Use {@see DefaultTypes::SMALLINT} instead. */
+    /** @deprecated Use {@see Types::SMALLINT} instead. */
     public const SMALLINT = Types::SMALLINT;
 
-    /** @deprecated Use {@see DefaultTypes::STRING} instead. */
+    /** @deprecated Use {@see Types::STRING} instead. */
     public const STRING = Types::STRING;
 
-    /** @deprecated Use {@see DefaultTypes::ARRAY} instead. */
+    /** @deprecated Use {@see Types::ARRAY} instead. */
     public const TARRAY = Types::ARRAY;
 
-    /** @deprecated Use {@see DefaultTypes::TEXT} instead. */
+    /** @deprecated Use {@see Types::TEXT} instead. */
     public const TEXT = Types::TEXT;
 
-    /** @deprecated Use {@see DefaultTypes::TIME_MUTABLE} instead. */
+    /** @deprecated Use {@see Types::TIME_MUTABLE} instead. */
     public const TIME = Types::TIME_MUTABLE;
 
-    /** @deprecated Use {@see DefaultTypes::TIME_IMMUTABLE} instead. */
+    /** @deprecated Use {@see Types::TIME_IMMUTABLE} instead. */
     public const TIME_IMMUTABLE = Types::TIME_IMMUTABLE;
 
     /**

lib/Doctrine/DBAL/Types/Types.php

@@ -34,7 +34,7 @@ final class Types
     public const TIME_MUTABLE         = 'time';
     public const TIME_IMMUTABLE       = 'time_immutable';
 
-    /** @deprecated json_array type is deprecated, use {@see DefaultTypes::JSON} instead. */
+    /** @deprecated json_array type is deprecated, use {@see self::JSON} instead. */
     public const JSON_ARRAY = 'json_array';
 
     private function __construct()

tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php

@@ -19,7 +19,9 @@ use Exception;
 use PDO;
 use RuntimeException;
 use Throwable;
+use function file_exists;
 use function in_array;
+use function unlink;
 
 class ConnectionTest extends DbalFunctionalTestCase
 {
@@ -31,6 +33,10 @@ class ConnectionTest extends DbalFunctionalTestCase
 
     protected function tearDown() : void
     {
+        if (file_exists('/tmp/test_nesting.sqlite')) {
+            unlink('/tmp/test_nesting.sqlite');
+        }
+
         parent::tearDown();
         $this->resetSharedConn();
     }

tests/continuousphp/install-pdo-oci.sh

@@ -2,4 +2,5 @@
 
 set -euo pipefail
 
-phpbrew ext install pdo_oci -- --with-pdo-oci=instantclient,/usr/local/instantclient
+docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/local/instantclient
+sudo -E env PHP_INI_DIR=/usr/local/etc/php docker-php-ext-install pdo_oci