sfox Sun Aug 31 19:18:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests phar_get_supported_signatures_001.phpt
phar_get_supported_signatures_001a.phpt
phar_get_supported_signatures_002.phpt
phar_get_supported_signatures_002a.phpt
phpinfo_004.phpt
Log:
- Ensure that we're always checking for OpenSSL support, rather than just for
ext/openssl being loaded
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt?r1=1.2.2.1&r2=1.2.2.2&diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.1
php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.2
--- php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt:1.2.2.1
Sun Jun 1 04:21:26 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_001.phpt Sun Aug
31 19:18:35 2008
@@ -1,9 +1,12 @@
--TEST--
Phar::getSupportedSignatures()
--SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (extension_loaded("hash")) die("skip extension hash conflicts"); ?>
-<?php if (extension_loaded("openssl")) die("skip extension openssl loaded"); ?>
+<?php
+if (!extension_loaded("phar")) die("skip");
+if (extension_loaded("hash")) die("skip extension hash conflicts");
+$arr = Phar::getSupportedSignatures();
+if (in_array("OpenSSL", $arr)) die("skip openssl support enabled");
+?>
--INI--
phar.require_hash=0
phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.1
php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.2
--- php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt:1.1.2.1
Tue Jun 10 19:23:09 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_001a.phpt Sun Aug
31 19:18:35 2008
@@ -1,9 +1,12 @@
--TEST--
Phar::getSupportedSignatures()
--SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (extension_loaded("hash")) die("skip extension hash conflicts"); ?>
-<?php if (!extension_loaded("openssl")) die("skip extension openssl loaded");
?>
+<?php
+if (!extension_loaded("phar")) die("skip");
+if (extension_loaded("hash")) die("skip extension hash conflicts");
+$arr = Phar::getSupportedSignatures();
+if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
+?>
--INI--
phar.require_hash=0
phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.2
php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.3
--- php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt:1.2.2.2
Mon Jun 23 19:18:01 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_002.phpt Sun Aug
31 19:18:35 2008
@@ -4,9 +4,8 @@
<?php
if (!extension_loaded("phar")) die("skip");
if (!extension_loaded("hash")) die("skip extension hash required");
-if (extension_loaded("openssl")) die("skip extension openssl loaded");
$arr = Phar::getSupportedSignatures();
-if (in_array("OpenSSL", $arr)) die ("skip native openssl support enabled");
+if (in_array("OpenSSL", $arr)) die ("skip openssl support enabled");
?>
--INI--
phar.require_hash=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt
diff -u php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.2
php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.3
--- php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt:1.1.2.2
Mon Jun 23 17:48:23 2008
+++ php-src/ext/phar/tests/phar_get_supported_signatures_002a.phpt Sun Aug
31 19:18:35 2008
@@ -1,9 +1,12 @@
--TEST--
Phar::getSupportedSignatures()
--SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("hash")) die("skip extension hash required"); ?>
-<?php if (!extension_loaded("openssl")) die("skip extension openssl
required"); ?>
+<?php
+if (!extension_loaded("phar")) die("skip");
+if (!extension_loaded("hash")) die("skip extension hash required");
+$arr = Phar::getSupportedSignatures();
+if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
+?>
--INI--
phar.require_hash=0
phar.readonly=0
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_004.phpt?r1=1.3.2.3&r2=1.3.2.4&diff_format=u
Index: php-src/ext/phar/tests/phpinfo_004.phpt
diff -u php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.3
php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.4
--- php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.3 Fri Aug 1 13:38:47 2008
+++ php-src/ext/phar/tests/phpinfo_004.phpt Sun Aug 31 19:18:35 2008
@@ -6,7 +6,7 @@
if (!extension_loaded("zlib")) die("skip zlib not loaded");
if (!extension_loaded("bz2")) die("skip bz2 not loaded");
$arr = Phar::getSupportedSignatures();
-if (in_array("OpenSSL", $arr)) die("skip native openssl support enabled");
+if (in_array("OpenSSL", $arr)) die("skip openssl support enabled");
?>
--INI--
phar.readonly=0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
