From 085a955bf458be62f81d4d32b6fdf71389f6f51c Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Thu, 25 Jun 2020 14:55:42 -0700 Subject: [PATCH 1/2] Mark OCI8Statement::convertPositionalToNamedPlaceholders() internal --- UPGRADE.md | 6 ++++++ lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php | 2 ++ 2 files changed, 8 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 0fedf7f1218..98e5d78aad1 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,5 +1,11 @@ # Upgrade to 2.11 +## Non-interface driver methods have been marked internal + +The non-interface methods of driver-level classes have been marked internal: + +- `OCI8Statement::convertPositionalToNamedPlaceholders()` + ## Inconsistently and ambiguously named driver-level classes are deprecated The following classes under the `Driver` namespace have been deprecated in favor of their consistently named counterparts: diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php index e023532d405..255b665b63a 100644 --- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php +++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Statement.php @@ -133,6 +133,8 @@ public function __construct($dbh, $query, OCI8Connection $conn) * Question marks inside literal strings are therefore handled correctly by this method. * This comes at a cost, the whole sql statement has to be looped over. * + * @internal + * * @param string $statement The SQL statement to convert. * * @return mixed[] [0] => the statement value (string), [1] => the paramMap value (array). From a35819db586487754e75851046d96d85c70f5649 Mon Sep 17 00:00:00 2001 From: Sergei Morozov Date: Thu, 25 Jun 2020 16:03:31 -0700 Subject: [PATCH 2/2] Mark OCI8Connection::getExecuteMode() internal --- UPGRADE.md | 1 + lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 98e5d78aad1..a25fefa5575 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -4,6 +4,7 @@ The non-interface methods of driver-level classes have been marked internal: +- `OCI8Connection::getExecuteMode()` - `OCI8Statement::convertPositionalToNamedPlaceholders()` ## Inconsistently and ambiguously named driver-level classes are deprecated diff --git a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php index b636b362cf2..2ee1e365fc3 100644 --- a/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php +++ b/lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php @@ -176,6 +176,8 @@ public function lastInsertId($name = null) /** * Returns the current execution mode. * + * @internal + * * @return int */ public function getExecuteMode()