Skip to content

Commit 843198e

Browse files
committed
Fix failures due to new deprecations
1 parent 5b5bfd6 commit 843198e

12 files changed

+32
-18
lines changed

ext/oci8/tests/bind_char_1.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ if ($r)
8787
do_e_q($s);
8888

8989
echo "Test 2.4: Type: AFC: Length: strlen\n";
90-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC);
90+
$r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC);
9191
if ($r)
9292
do_e_q($s);
9393

9494
echo "Test 2.5: Type: AFC. Length: strlen-1\n";
95-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC);
95+
$r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC);
9696
if ($r)
9797
do_e_q($s);
9898

9999
echo "Test 2.6: Type: AFC. Length: strlen+1\n";
100-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC);
100+
$r = oci_bind_by_name($s, ":bv", $bv1, 1, SQLT_AFC);
101101
if ($r)
102102
do_e_q($s);
103103

@@ -159,17 +159,17 @@ if ($r)
159159
do_e_q($s);
160160

161161
echo "Test 4.4: Type: AFC: Length: strlen\n";
162-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1), SQLT_AFC);
162+
$r = oci_bind_by_name($s, ":bv", $bv1, 0, SQLT_AFC);
163163
if ($r)
164164
do_e_q($s);
165165

166166
echo "Test 4.5: Type: AFC. Length: strlen-1\n";
167-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)-1, SQLT_AFC);
167+
$r = oci_bind_by_name($s, ":bv", $bv1, -1, SQLT_AFC);
168168
if ($r)
169169
do_e_q($s);
170170

171171
echo "Test 4.6: Type: AFC. Length: strlen+1\n";
172-
$r = oci_bind_by_name($s, ":bv", $bv1, strlen($bv1)+1, SQLT_AFC);
172+
$r = oci_bind_by_name($s, ":bv", $bv1, +1, SQLT_AFC);
173173
if ($r)
174174
do_e_q($s);
175175

ext/oci8/tests/coll_010.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc');
1010

1111
require __DIR__."/connect.inc";
1212

13-
$ora_sql = "DROP TYPE
14-
".$type_name."
15-
";
13+
error_reporting(E_ALL ^ E_DEPRECATED);
14+
15+
$ora_sql = "DROP TYPE ".$type_name;
1616

1717
$statement = oci_parse($c,$ora_sql);
1818
@oci_execute($statement);

ext/oci8/tests/coll_010_func.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc');
1010

1111
require __DIR__."/connect.inc";
1212

13-
$ora_sql = "DROP TYPE
14-
".$type_name."
15-
";
13+
error_reporting(E_ALL ^ E_DEPRECATED);
14+
15+
$ora_sql = "DROP TYPE ".$type_name;
1616

1717
$statement = oci_parse($c,$ora_sql);
1818
@oci_execute($statement);

ext/oci8/tests/coll_017.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc');
1010

1111
require __DIR__."/connect.inc";
1212

13-
$ora_sql = "DROP TYPE
14-
".$type_name."
15-
";
13+
error_reporting(E_ALL ^ E_DEPRECATED);
14+
15+
$ora_sql = "DROP TYPE ".$type_name;
1616

1717
$statement = oci_parse($c,$ora_sql);
1818
@oci_execute($statement);

ext/oci8/tests/coll_017_func.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require(__DIR__.'/skipif.inc');
1010

1111
require __DIR__."/connect.inc";
1212

13-
$ora_sql = "DROP TYPE
14-
".$type_name."
15-
";
13+
error_reporting(E_ALL ^ E_DEPRECATED);
14+
15+
$ora_sql = "DROP TYPE ".$type_name;
1616

1717
$statement = oci_parse($c,$ora_sql);
1818
@oci_execute($statement);

ext/oci8/tests/coll_019.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ require(__DIR__.'/skipif.inc');
88
--FILE--
99
<?php
1010

11+
error_reporting(E_ALL ^ E_DEPRECATED);
12+
1113
require __DIR__."/connect.inc";
1214

1315
$ora_sql = "DROP TYPE ".$type_name;

ext/oci8/tests/conn_attr_4.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ if (!(isset($matches[0]) &&
2121
--FILE--
2222
<?php
2323

24+
error_reporting(E_ALL ^ E_DEPRECATED);
25+
2426
$testuser = 'testuser_attr_4'; // Used in conn_attr.inc
2527
$testpassword = 'testuser';
2628

ext/oci8/tests/edition_2.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ if (!(isset($matches[0]) &&
2727
--FILE--
2828
<?php
2929

30+
error_reporting(E_ALL ^ E_DEPRECATED);
31+
3032
/* In 11.2, there can only be one child edition. So this test will
3133
* fail to create the necessary editions if a child edition exists
3234
* already

ext/oci8/tests/extauth_01.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ oci8.privileged_connect=1
1212
--FILE--
1313
<?php
1414

15+
error_reporting(E_ALL ^ E_DEPRECATED);
16+
1517
// Run Test
1618

1719
echo "Test 1\n";

ext/oci8/tests/extauth_02.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ oci8.privileged_connect=1
1111
--FILE--
1212
<?php
1313

14+
error_reporting(E_ALL ^ E_DEPRECATED);
15+
1416
// Run Test
1517

1618
echo "Test 1\n";

ext/oci8/tests/extauth_03.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ oci8.privileged_connect=1
1111
--FILE--
1212
<?php
1313

14+
error_reporting(E_ALL ^ E_DEPRECATED);
15+
1416
// Run Test
1517

1618
echo "Test 1\n";

ext/oci8/tests/lob_null.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ require(__DIR__.'/skipif.inc');
1010

1111
require __DIR__.'/connect.inc';
1212

13+
error_reporting(E_ALL ^ E_DEPRECATED);
14+
1315
// Initialization
1416

1517
$s = oci_parse($c, 'drop table lob_null_tab');

0 commit comments

Comments
 (0)