Fix phar tests with hash extension

- The hash extension is now always available.

- Remove unfinished test
  The Phar::PGP currently doesn't exist yet.

diff --git a/ext/phar/tests/phar_buildfromiterator10.phpt b/ext/phar/tests/phar_buildfromiterator10.phpt
index 7b7eca0e6fa2b422222a079cf7b94cade83ba773..a7b9c8701b51cc9226f7a273f17b988df592b07f 100644 (file)
--- a/ext/phar/tests/phar_buildfromiterator10.phpt
+++ b/ext/phar/tests/phar_buildfromiterator10.phpt
@@ -29,11 +29,9 @@ unlink(__DIR__ . '/buildfromiterator10.phar');
 __HALT_COMPILER();
 ?>
 --EXPECTF--
-array(35) {
+array(34) {
   ["phar_ctx_001.phpt"]=>
   string(%d) "%sphar_ctx_001.phpt"
-  ["phar_get_supported_signatures_001.phpt"]=>
-  string(%d) "%sphar_get_supported_signatures_001.phpt"
   ["phar_get_supported_signatures_002.phpt"]=>
   string(%d) "%sphar_get_supported_signatures_002.phpt"
   ["phar_oo_001.phpt"]=>

diff --git a/ext/phar/tests/phar_get_supported_signatures_001.phpt b/ext/phar/tests/phar_get_supported_signatures_001.phpt
deleted file mode 100644 (file)
index 64874f6..0000000
--- a/ext/phar/tests/phar_get_supported_signatures_001.phpt
+++ /dev/null
@@ -1,26 +0,0 @@
---TEST--
-Phar::getSupportedSignatures()
---SKIPIF--
-<?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
---FILE--
-<?php
-var_dump(Phar::getSupportedSignatures());
-?>
-===DONE===
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(3) "MD5"
-  [1]=>
-  string(5) "SHA-1"
-}
-===DONE===

diff --git a/ext/phar/tests/phar_get_supported_signatures_001a.phpt b/ext/phar/tests/phar_get_supported_signatures_001a.phpt
deleted file mode 100644 (file)
index ad929df..0000000
--- a/ext/phar/tests/phar_get_supported_signatures_001a.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Phar::getSupportedSignatures()
---SKIPIF--
-<?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
---FILE--
-<?php
-var_dump(Phar::getSupportedSignatures());
-?>
-===DONE===
-?>
---EXPECT--
-array(3) {
-  [0]=>
-  string(3) "MD5"
-  [1]=>
-  string(5) "SHA-1"
-  [2]=>
-  string(7) "OpenSSL"
-}
-===DONE===

diff --git a/ext/phar/tests/phar_get_supported_signatures_002.phpt b/ext/phar/tests/phar_get_supported_signatures_002.phpt
index 7e17aedca55a1afea7fa440cebc770db0d4b066a..d55785264d7413b3ce70274738b49f5f0f9dd29b 100644 (file)
--- a/ext/phar/tests/phar_get_supported_signatures_002.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_002.phpt
@@ -5,7 +5,6 @@ Phar::getSupportedSignatures()
 if (!extension_loaded("phar")) die("skip");
 $arr = Phar::getSupportedSignatures();
 if (in_array("OpenSSL", $arr)) die("skip openssl support enabled");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
index 7260607a1458b8fd54d0c1b2571e2accee737730..391ee600cc48b524c23bb92dfd583d3a6275bc10 100644 (file)
--- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt
+++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
@@ -5,7 +5,6 @@ Phar::getSupportedSignatures()
 if (!extension_loaded("phar")) die("skip");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt
deleted file mode 100644 (file)
index 0b8647b..0000000
--- a/ext/phar/tests/phar_setsignaturealgo1.phpt
+++ /dev/null
@@ -1,70 +0,0 @@
---TEST--
-Phar::setSignatureAlgorithm()
---SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if ( extension_loaded("hash")) die("skip extension hash conflicts"); ?>
-<?php if (!defined("Phar::PGP")) die("skip PGP Signature algorithm not available"); ?>
---INI--
-phar.require_hash=0
-phar.readonly=0
---FILE--
-<?php
-$p = new Phar(__DIR__ . '/phar_setsignaturealgo1.phar', 0, 'phar_setsignaturealgo1.phar');
-$p['file1.txt'] = 'hi';
-var_dump($p->getSignature());
-$p->setSignatureAlgorithm(Phar::MD5);
-var_dump($p->getSignature());
-$p->setSignatureAlgorithm(Phar::SHA1);
-var_dump($p->getSignature());
-try {
-$p->setSignatureAlgorithm(Phar::SHA256);
-var_dump($p->getSignature());
-} catch (Exception $e) {
-echo $e->getMessage();
-}
-try {
-$p->setSignatureAlgorithm(Phar::SHA512);
-var_dump($p->getSignature());
-} catch (Exception $e) {
-echo $e->getMessage();
-}
-try {
-$p->setSignatureAlgorithm(Phar::PGP);
-var_dump($p->getSignature());
-} catch (Exception $e) {
-echo $e->getMessage();
-}
-?>
-===DONE===
---CLEAN--
-<?php
-unlink(__DIR__ . '/phar_setsignaturealgo1.phar');
-?>
---EXPECTF--
-array(2) {
-  ["hash"]=>
-  string(%d) "%s"
-  ["hash_type"]=>
-  string(5) "SHA-1"
-}
-array(2) {
-  ["hash"]=>
-  string(%d) "%s"
-  ["hash_type"]=>
-  string(3) "MD5"
-}
-array(2) {
-  ["hash"]=>
-  string(%d) "%s"
-  ["hash_type"]=>
-  string(5) "SHA-1"
-}
-string (82) "SHA-256 and SHA-512 signatures are only supported if the hash extension is enabled"
-string (82) "SHA-256 and SHA-512 signatures are only supported if the hash extension is enabled"
-array(2) {
-  ["hash"]=>
-  string(%d) "%s"
-  ["hash_type"]=>
-  string(5) "SHA-1"
-}
-===DONE===

diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt
index 92b7b2dcf132cf151b12493c473cf4a6705d14cc..726e756a656670de18dd835af5e2ffab0abc8445 100644 (file)
--- a/ext/phar/tests/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
@@ -5,7 +5,6 @@ Phar::setSupportedSignatures() with hash
 if (!extension_loaded("phar")) die("skip");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
index d854455df9b8ad8fd0d81a9b359b11c8d049d967..28d494e9e892ccc70aa31f79a85b4d48e1158e58 100644 (file)
--- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
@@ -5,7 +5,6 @@ Phar::setSupportedSignatures() with hash, tar-based
 <?php
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0

diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt
index f94a02924efedf577596febeb0f33961c3a90ce1..69fafdb08baff5da27c9dfa5dc6c683b81ad9736 100644 (file)
--- a/ext/phar/tests/test_signaturealgos.phpt
+++ b/ext/phar/tests/test_signaturealgos.phpt
@@ -5,7 +5,6 @@ Phar: verify signature parsing works
 if (!extension_loaded("phar")) die("skip");
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared");
 ?>
 --INI--
 phar.require_hash=0

diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
index 6ecceb98521541b66794e89c34237763d4766ba8..53f9461c9850b566677f88817b563a5afd2a1c8b 100644 (file)
--- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
@@ -5,7 +5,6 @@ Phar::setSupportedSignatures() with hash, zip-based
 <?php
 $arr = Phar::getSupportedSignatures();
 if (!in_array("OpenSSL", $arr)) die("skip openssl support required");
-if (!in_array('SHA-256', $arr)) die("skip hash extension loaded shared"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0