diff options
author | Christopher Jones <christopher.jones@oracle.com> | 2021-02-15 12:15:44 +1100 |
---|---|---|
committer | Christopher Jones <christopher.jones@oracle.com> | 2021-02-15 12:17:46 +1100 |
commit | 843198eb84ec31f9c2523f55eb5f2970a3c731ae (patch) | |
tree | 1d16163860b7d7823270542fb6a496b229bf367e /ext/oci8 | |
parent | 5b5bfd6be48de4601d508fa5b8a7a572dda6b8bc (diff) | |
download | php-git-843198eb84ec31f9c2523f55eb5f2970a3c731ae.tar.gz |
Fix failures due to new deprecations
Diffstat (limited to 'ext/oci8')
-rw-r--r-- | ext/oci8/tests/bind_char_1.phpt | 12 | ||||
-rw-r--r-- | ext/oci8/tests/coll_010.phpt | 6 | ||||
-rw-r--r-- | ext/oci8/tests/coll_010_func.phpt | 6 | ||||
-rw-r--r-- | ext/oci8/tests/coll_017.phpt | 6 | ||||
-rw-r--r-- | ext/oci8/tests/coll_017_func.phpt | 6 | ||||
-rw-r--r-- | ext/oci8/tests/coll_019.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/conn_attr_4.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/edition_2.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/extauth_01.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/extauth_02.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/extauth_03.phpt | 2 | ||||
-rw-r--r-- | ext/oci8/tests/lob_null.phpt | 2 |
12 files changed, 32 insertions, 18 deletions
diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index f405155980..93dcd96e37 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -87,17 +87,17 @@ if ($r) do_e_q($s); echo "Test 2.4: Type: AFC: Length: strlen\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) do_e_q($s); echo "Test 2.5: Type: AFC. Length: strlen-1\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) do_e_q($s); echo "Test 2.6: Type: AFC. Length: strlen+1\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, 1, SQLT_AFC); if ($r) do_e_q($s); @@ -159,17 +159,17 @@ if ($r) do_e_q($s); echo "Test 4.4: Type: AFC: Length: strlen\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC); if ($r) do_e_q($s); echo "Test 4.5: Type: AFC. Length: strlen-1\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC); if ($r) do_e_q($s); echo "Test 4.6: Type: AFC. Length: strlen+1\n"; -$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC); +$r = oci_bind_by_name($s, ":bv", $bv1, +1, SQLT_AFC); if ($r) do_e_q($s); diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt index da0b278e07..005dcd5460 100644 --- a/ext/oci8/tests/coll_010.phpt +++ b/ext/oci8/tests/coll_010.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; -$ora_sql = "DROP TYPE - ".$type_name." - "; +error_reporting(E_ALL ^ E_DEPRECATED); + +$ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @oci_execute($statement); diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt index f244ce16a8..3950dc7cb4 100644 --- a/ext/oci8/tests/coll_010_func.phpt +++ b/ext/oci8/tests/coll_010_func.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; -$ora_sql = "DROP TYPE - ".$type_name." - "; +error_reporting(E_ALL ^ E_DEPRECATED); + +$ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @oci_execute($statement); diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt index 6701a930c3..082713a732 100644 --- a/ext/oci8/tests/coll_017.phpt +++ b/ext/oci8/tests/coll_017.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; -$ora_sql = "DROP TYPE - ".$type_name." - "; +error_reporting(E_ALL ^ E_DEPRECATED); + +$ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @oci_execute($statement); diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt index b1c403a16b..8f4587d54c 100644 --- a/ext/oci8/tests/coll_017_func.phpt +++ b/ext/oci8/tests/coll_017_func.phpt @@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc'); require __DIR__."/connect.inc"; -$ora_sql = "DROP TYPE - ".$type_name." - "; +error_reporting(E_ALL ^ E_DEPRECATED); + +$ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @oci_execute($statement); diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt index be79e98aab..de6e187102 100644 --- a/ext/oci8/tests/coll_019.phpt +++ b/ext/oci8/tests/coll_019.phpt @@ -8,6 +8,8 @@ require(__DIR__.'/skipif.inc'); --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name; diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index e4e457194d..9cf55f55f9 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -21,6 +21,8 @@ if (!(isset($matches[0]) && --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + $testuser = 'testuser_attr_4'; // Used in conn_attr.inc $testpassword = 'testuser'; diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 4aab1c36bc..7cfcaa8d18 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -27,6 +27,8 @@ if (!(isset($matches[0]) && --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + /* In 11.2, there can only be one child edition. So this test will * fail to create the necessary editions if a child edition exists * already diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt index db23097d82..6b543922ec 100644 --- a/ext/oci8/tests/extauth_01.phpt +++ b/ext/oci8/tests/extauth_01.phpt @@ -12,6 +12,8 @@ oci8.privileged_connect=1 --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + // Run Test echo "Test 1\n"; diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt index c8c3dd6725..03911fda90 100644 --- a/ext/oci8/tests/extauth_02.phpt +++ b/ext/oci8/tests/extauth_02.phpt @@ -11,6 +11,8 @@ oci8.privileged_connect=1 --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + // Run Test echo "Test 1\n"; diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt index 863f94499b..7aefc4726f 100644 --- a/ext/oci8/tests/extauth_03.phpt +++ b/ext/oci8/tests/extauth_03.phpt @@ -11,6 +11,8 @@ oci8.privileged_connect=1 --FILE-- <?php +error_reporting(E_ALL ^ E_DEPRECATED); + // Run Test echo "Test 1\n"; diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt index 2543aeef81..df9c83fd47 100644 --- a/ext/oci8/tests/lob_null.phpt +++ b/ext/oci8/tests/lob_null.phpt @@ -10,6 +10,8 @@ require(__DIR__.'/skipif.inc'); require __DIR__.'/connect.inc'; +error_reporting(E_ALL ^ E_DEPRECATED); + // Initialization $s = oci_parse($c, 'drop table lob_null_tab'); |