fix tests, add missing break to setSignatureAlgorithm()

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 5d8db91181a701a009de52ccf7e4c404d36b15ad..792f2e5699a3a04015e967a8b8a12c2a13fa8fae 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -389,6 +389,7 @@ PHP_METHOD(Phar, setSignatureAlgorithm)
                                zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, error);
                                efree(error);
                        }
+                       break;
                default :
                        zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,
                                "Unknown signature algorithm specified");

diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt
index 1b206f2668a91bd3126a67b9d7dce8726e1c33a5..7aaae500d98edb79dcfa177ab173917236c7cddc 100644 (file)
--- a/ext/phar/tests/phar_setsignaturealgo1.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo1.phpt
@@ -39,20 +39,31 @@ echo $e->getMessage();
 <?php 
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
---EXPECT--
-bool(false)
-array(1) {
-  [hash_type]=>
+--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(1) {
-  [hash_type]=>
+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(1) {
-  [hash_type]=>
+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 83168430e7717d05849d03edcd259df5da4fab9c..47ec0e4ca392df7ececb43e52b6b2ea83c9d4b0a 100644 (file)
--- a/ext/phar/tests/phar_setsignaturealgo2.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
@@ -39,26 +39,41 @@ echo $e->getMessage();
 <?php 
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
---EXPECT--
-bool(false)
-array(1) {
-  [hash_type]=>
+--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(1) {
-  [hash_type]=>
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
   string(5) "SHA-1"
 }
-array(1) {
-  [hash_type]=>
-  string(5) "SHA-256"
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(7) "SHA-256"
 }
-array(1) {
-  [hash_type]=>
-  string(5) "SHA-512"
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
+  string(7) "SHA-512"
 }
-array(1) {
-  [hash_type]=>
+array(2) {
+  ["hash"]=>
+  string(%d) "%s"
+  ["hash_type"]=>
   string(5) "SHA-1"
 }
 ===DONE===