From b66472685f0a1aad74deee853387eb42d9153921 Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Mon, 23 Jan 2023 14:29:31 +0100 Subject: [PATCH 1/6] Add $parametersBound property to the class to avoid deprecation notices As dynamic properties as not allowed anymore with 8.2, $parametersBound property was causing a deprecation notice "Creation of dynamic property Laminas\Db\Adapter\Driver\Oci8\Statement::$parametersBound is deprecated" Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index 3519bc9c..b53f0a71 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -34,6 +34,9 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; + + /** @var bool */ + protected $parametersBound; /** * Is prepared From d6877518a772d92114706bcb5e95000ffbe673e4 Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Mon, 23 Jan 2023 14:38:16 +0100 Subject: [PATCH 2/6] Code sniffer fix Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index b53f0a71..bd5f7c1c 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -35,7 +35,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; - /** @var bool */ + /** @var bool */ protected $parametersBound; /** From bb78c4d37fa72a7bf13133c558eb381111257a5a Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Tue, 31 Jan 2023 10:07:47 +0100 Subject: [PATCH 3/6] updates according to @Ocramius comments Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index bd5f7c1c..770be03d 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -35,8 +35,12 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; - /** @var bool */ - protected $parametersBound; + /** + * @var bool + * @internal + * @deprecated + */ + public $parametersBound; /** * Is prepared From 785bf90a5080f47902d12f63f2b8ac0df4846619 Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Tue, 31 Jan 2023 11:15:22 +0100 Subject: [PATCH 4/6] phpcs edits Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index 770be03d..56995036 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -35,11 +35,11 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; - /** - * @var bool + /** + * @var bool * @internal * @deprecated - */ + */ public $parametersBound; /** From 51767feee719343094af1dc675e4c2fa9c2cbab1 Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Tue, 31 Jan 2023 11:25:25 +0100 Subject: [PATCH 5/6] phpcs Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index 56995036..f6f494c4 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -34,7 +34,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; - + /** * @var bool * @internal From 196332849cc1aff08d522a49aa430707a7753d50 Mon Sep 17 00:00:00 2001 From: Olivier MELLINGER Date: Tue, 31 Jan 2023 11:49:05 +0100 Subject: [PATCH 6/6] Update Statement.php Signed-off-by: Olivier MELLINGER --- src/Adapter/Driver/Oci8/Statement.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php index f6f494c4..21747b62 100644 --- a/src/Adapter/Driver/Oci8/Statement.php +++ b/src/Adapter/Driver/Oci8/Statement.php @@ -9,8 +9,23 @@ use function is_array; use function is_string; +use function oci_bind_by_name; +use function oci_error; +use function oci_execute; +use function oci_new_descriptor; +use function oci_parse; +use function oci_statement_type; use function sprintf; +use const OCI_B_CLOB; +use const OCI_COMMIT_ON_SUCCESS; +use const OCI_DTYPE_LOB; +use const OCI_NO_AUTO_COMMIT; +use const OCI_TEMP_CLOB; +use const SQLT_BIN; +use const SQLT_CHR; +use const SQLT_INT; + class Statement implements StatementInterface, Profiler\ProfilerAwareInterface { /** @var resource */ @@ -34,11 +49,12 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface /** @var resource */ protected $resource; - + /** - * @var bool * @internal * @deprecated + * + * @var bool */ public $parametersBound;