sixd Tue, 07 Jun 2011 20:58:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=311900
Log:
Update tests to match Felipe's null byte arg parsing change
Changed paths:
U php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt
U php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt
2011-06-07 20:35:58 UTC (rev 311899)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt
2011-06-07 20:58:08 UTC (rev 311900)
@@ -1,5 +1,5 @@
--TEST--
-Protect against null bytes in LOB filenames
(http://news.php.net/php.internals/50202)
+Protect against null bytes in LOB filenames
--SKIPIF--
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
--INI--
@@ -8,6 +8,9 @@
--FILE--
<?php
+// See http://news.php.net/php.internals/50202
+// http://svn.php.net/viewvc?view=revision&revision=311870
+
require(dirname(__FILE__).'/connect.inc');
// Run Test
@@ -29,10 +32,10 @@
--EXPECTF--
Test 1: Import
-Warning: OCI-Lob::savefile(): Filename cannot contain null bytes in
%snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string
given in %snull_byte_1.php on line %d
+NULL
Test 2: Export
-Warning: OCI-Lob::export(): Filename cannot contain null bytes in
%snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given
in %snull_byte_1.php on line %d
+NULL
===DONE===
Modified: php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt 2011-06-07 20:35:58 UTC
(rev 311899)
+++ php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt 2011-06-07 20:58:08 UTC
(rev 311900)
@@ -1,5 +1,5 @@
--TEST--
-Protect against null bytes in LOB filenames
(http://news.php.net/php.internals/50202)
+Protect against null bytes in LOB filenames
--SKIPIF--
<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
--INI--
@@ -8,6 +8,10 @@
--FILE--
<?php
+// See http://news.php.net/php.internals/50202
+// http://svn.php.net/viewvc?view=revision&revision=311870
+
+
require(dirname(__FILE__).'/connect.inc');
// Run Test
@@ -29,10 +33,10 @@
--EXPECTF--
Test 1: Import
-Warning: OCI-Lob::savefile(): Filename cannot contain null bytes in
%snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::savefile() expects parameter 1 to be valid path, string
given in %snull_byte_1.php on line %d
+NULL
Test 2: Export
-Warning: OCI-Lob::export(): Filename cannot contain null bytes in
%snull_byte_1.php on line %d
-bool(false)
+Warning: OCI-Lob::export() expects parameter 1 to be valid path, string given
in %snull_byte_1.php on line %d
+NULL
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
