increase code coverage, fix minor memleak

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 749937f4ab714d6401b5b43c780011cfc05b3f9e..7eb6a347667ecafad9b54c80113fdb71c3f43da7 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1976,6 +1976,7 @@ PHP_METHOD(Phar, convertToData)
                        } else {
                                zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 TSRMLS_CC,
                                        "Cannot write out data phar archive, use Phar::TAR or Phar::ZIP");
+                               return;
                        }
                        break;
                case PHAR_FORMAT_PHAR:

diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt
index 903eb6afe52f0aa3c50c0657c7446160aeec60b9..a31a4e219ce860b1f4b31cb72ecfd7e88d3fe9d5 100644 (file)
--- a/ext/phar/tests/phar_convert_again.phpt
+++ b/ext/phar/tests/phar_convert_again.phpt
@@ -44,8 +44,12 @@ $phar['a']->setMetadata('hi');
 $zip = $phar->convertToExecutable(Phar::ZIP);
 echo $zip->getPath() . "\n";
 echo $zip['a']->getMetadata() . "\n";
+$data = $zip->convertToData();
+echo $data->getPath() . "\n";
 $tar = $phar->convertToExecutable(Phar::TAR);
 echo $tar->getPath() . "\n";
+$data = $tar->convertToData();
+echo $data->getPath() . "\n";
 $tgz = $tar->convertToExecutable(null, Phar::GZ);
 echo $tgz->getPath() . "\n";
 try {
@@ -63,6 +67,41 @@ $tgz->convertToExecutable(Phar::ZIP, Phar::BZ2);
 } catch (Exception $e) {
 echo $e->getMessage() . "\n";
 }
+try {
+$phar->convertToData();
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToData(Phar::PHAR);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToData(25);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToData(Phar::ZIP, Phar::GZ);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToData(Phar::ZIP, Phar::BZ2);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToExecutable(Phar::TAR, 25);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
+try {
+$tgz->convertToData(Phar::TAR, 25);
+} catch (Exception $e) {
+echo $e->getMessage() . "\n";
+}
 ?>
 ===DONE===
 --CLEAN--
@@ -74,7 +113,9 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar.bz2');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.tbz');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.tar');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.zip');
+unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.zip');
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '2.phar.tar.gz');
 __HALT_COMPILER();
 ?>
@@ -86,9 +127,18 @@ Unable to add newly converted phar "%sphar_convert_again.phar" to the list of ph
 %sphar_convert_again2.phar
 %sphar_convert_again2.phar.zip
 hi
+%sphar_convert_again2.zip
 %sphar_convert_again2.phar.tar
+%sphar_convert_again2.tar
 %sphar_convert_again2.phar.tar.gz
 Unknown file format specified, please pass one of Phar::PHAR, Phar::TAR or Phar::ZIP
 Cannot compress entire archive with gzip, zip archives do not support whole-archive compression
 Cannot compress entire archive with bz2, zip archives do not support whole-archive compression
+Cannot write out data phar archive, use Phar::TAR or Phar::ZIP
+Cannot write out data phar archive, use Phar::TAR or Phar::ZIP
+Unknown file format specified, please pass one of Phar::TAR or Phar::ZIP
+Cannot compress entire archive with gzip, zip archives do not support whole-archive compression
+Cannot compress entire archive with bz2, zip archives do not support whole-archive compression
+Unknown compression specified, please pass one of Phar::GZ or Phar::BZ2
+Unknown compression specified, please pass one of Phar::GZ or Phar::BZ2
 ===DONE===