sixd                                     Tue, 14 Jun 2011 20:04:18 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=312169

Log:
Improve cross version compat

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-14 20:03:26 UTC (rev 312168)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/null_byte_1.phpt        
2011-06-14 20:04:18 UTC (rev 312169)
@@ -1,7 +1,12 @@
 --TEST--
 Protect against null bytes in LOB filenames
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8'))
+    die ("skip no oci8 extension");
+if (PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4))
+    die ("skip Test only valid for PHP 5.4 onwards");
+?>
 --INI--
 display_errors = On
 error_reporting = E_WARNING

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-14 20:03:26 UTC 
(rev 312168)
+++ php/php-src/trunk/ext/oci8/tests/null_byte_1.phpt   2011-06-14 20:04:18 UTC 
(rev 312169)
@@ -1,7 +1,12 @@
 --TEST--
 Protect against null bytes in LOB filenames
 --SKIPIF--
-<?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?>
+<?php
+if (!extension_loaded('oci8'))
+    die ("skip no oci8 extension");
+if (PHP_MAJOR_VERSION < 5 || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 4))
+    die ("skip Test only valid for PHP 5.4 onwards");
+?>
 --INI--
 display_errors = On
 error_reporting = E_WARNING
@@ -11,7 +16,6 @@
 // See http://news.php.net/php.internals/50202
 //     http://svn.php.net/viewvc?view=revision&revision=311870

-
 require(dirname(__FILE__).'/connect.inc');

 // Run Test

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to