refactor isTar/isZip/isPhar into isFileFormat(int format) where format is one of Phar::TAR,, Phar::ZIP, Phar::PHAR

[DOC]

34 files changed, 128 insertions, 123 deletions

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 3bb16209dd..1f199041fb 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1682,36 +1682,28 @@ PHP_METHOD(Phar, count)
 }
 /* }}} */
 
-/* {{{ proto bool Phar::isTar()
- * Returns true if the phar archive is based on the tar file format
+/* {{{ proto bool Phar::isFileFormat(int format)
+ * Returns true if the phar archive is based on the tar/zip/phar file format depending
+ * on whether Phar::TAR, Phar::ZIP or Phar::PHAR was passed in
  */
-PHP_METHOD(Phar, isTar)
+PHP_METHOD(Phar, isFileFormat)
 {
+	long type;
 	PHAR_ARCHIVE_OBJECT();
-	
-	RETURN_BOOL(phar_obj->arc.archive->is_tar);
-}
-/* }}} */
-
-/* {{{ proto bool Phar::isZip()
- * Returns true if the phar archive is based on the Zip file format
- */
-PHP_METHOD(Phar, isZip)
-{
-	PHAR_ARCHIVE_OBJECT();
-	
-	RETURN_BOOL(phar_obj->arc.archive->is_zip);
-}
-/* }}} */
 
-/* {{{ proto bool Phar::isPhar()
- * Returns true if the phar archive is based on the phar file format
- */
-PHP_METHOD(Phar, isPhar)
-{
-	PHAR_ARCHIVE_OBJECT();
-	
-	RETURN_BOOL(!phar_obj->arc.archive->is_tar && !phar_obj->arc.archive->is_zip);
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type) == FAILURE) {
+		RETURN_FALSE;
+	}
+	switch (type) {
+		case PHAR_FORMAT_TAR:
+			RETURN_BOOL(phar_obj->arc.archive->is_tar);
+		case PHAR_FORMAT_ZIP:
+			RETURN_BOOL(phar_obj->arc.archive->is_zip);
+		case PHAR_FORMAT_PHAR:
+			RETURN_BOOL(!phar_obj->arc.archive->is_tar && !phar_obj->arc.archive->is_zip);
+		default:
+			zend_throw_exception_ex(phar_ce_PharException, 0 TSRMLS_CC, "Unknown file format specified");
+	}
 }
 /* }}} */
 
@@ -4414,6 +4406,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_fromstring, 0, 0, 1)
 	ZEND_ARG_INFO(0, contents)
 ZEND_END_ARG_INFO();
 
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_isff, 0, 0, 1)
+	ZEND_ARG_INFO(0, fileformat)
+ZEND_END_ARG_INFO();
+
 #endif /* HAVE_SPL */
 
 zend_function_entry php_archive_methods[] = {
@@ -4447,10 +4444,8 @@ zend_function_entry php_archive_methods[] = {
 	PHP_ME(Phar, hasMetadata,           NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, isBuffering,           NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, isCompressed,          NULL,                      ZEND_ACC_PUBLIC)
+	PHP_ME(Phar, isFileFormat,          arginfo_phar_isff,         ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, isWritable,            NULL,                      ZEND_ACC_PUBLIC)
-	PHP_ME(Phar, isPhar,                NULL,                      ZEND_ACC_PUBLIC)
-	PHP_ME(Phar, isTar,                 NULL,                      ZEND_ACC_PUBLIC)
-	PHP_ME(Phar, isZip,                 NULL,                      ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, offsetExists,          arginfo_phar_offsetExists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, offsetGet,             arginfo_phar_offsetExists, ZEND_ACC_PUBLIC)
 	PHP_ME(Phar, offsetSet,             arginfo_phar_offsetSet,    ZEND_ACC_PUBLIC)
diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt
index 0fe3cedf25..a02b9d81e6 100644
--- a/ext/phar/tests/dir.phpt
+++ b/ext/phar/tests/dir.phpt
@@ -14,7 +14,7 @@ $pname2 = 'phar://' . $fname2;
 $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname3 = 'phar://' . $fname3;
 $phar = new Phar($fname);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 
 $phar->addEmptyDir('test');
 var_dump($phar['test']->isDir());
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index b681849c25..b2781c6846 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -35,8 +35,15 @@ $a = new Phar($fname);
 $a['test'] = 'hi';
 copy($fname, $fname2);
 $b = new Phar($fname2);
-var_dump($b->isPhar());
+var_dump($b->isFileFormat(Phar::PHAR));
 var_dump($b->isCompressed() == Phar::BZ2);
+// additional code coverage
+$b->isFileFormat(array());
+try {
+$b->isFileFormat(25);
+} catch (Exception $e) {
+echo $e->getMessage(),"\n";
+}
 ?>
 ===DONE===
 --CLEAN--
@@ -49,4 +56,7 @@ string(9) "it worked"
 string(%d) "phar://%sphar_bz2.phar/tar_004.php"
 bool(true)
 bool(true)
+
+Warning: Phar::isFileFormat() expects parameter 1 to be long, array given in %sphar_bz2.php on line %d
+Unknown file format specified
 ===DONE===
\ No newline at end of file
diff --git a/ext/phar/tests/phar_convert_repeated.phpt b/ext/phar/tests/phar_convert_repeated.phpt
index f6fba99247..b2ef195ea7 100644
--- a/ext/phar/tests/phar_convert_repeated.phpt
+++ b/ext/phar/tests/phar_convert_repeated.phpt
@@ -24,63 +24,63 @@ include 'files/phar_test.inc';
 
 echo "=================== new Phar() =======================\n";
 $phar = new Phar($fname);
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToTar() =====================\n";
 
 $phar = $phar->convertToExecutable(Phar::TAR);
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToZip() =====================\n";
 
 $phar = $phar->convertToExecutable(Phar::ZIP);
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToPhar() ====================\n";
 
 $phar = $phar->convertToExecutable(Phar::PHAR, Phar::NONE, '.2.phar');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump(strlen($phar->getStub()));
 var_dump($phar->getAlias());
 
 echo "================= convertToZip() =====================\n";
 
 $phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '.2.phar.zip');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToTar() =====================\n";
 
 $phar = $phar->convertToExecutable(Phar::TAR, Phar::NONE, '2.phar.tar');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToZip() =====================\n";
 
 $phar = $phar->convertToExecutable(Phar::ZIP, Phar::NONE, '3.phar.zip');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
diff --git a/ext/phar/tests/phar_convert_repeated_b.phpt b/ext/phar/tests/phar_convert_repeated_b.phpt
index 2b29c23fb4..3d958927bb 100644
--- a/ext/phar/tests/phar_convert_repeated_b.phpt
+++ b/ext/phar/tests/phar_convert_repeated_b.phpt
@@ -15,27 +15,27 @@ $phar['a'] = 'a';
 $phar['b'] = 'b';
 $phar['c'] = 'c';
 
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToTar() =====================\n";
 
 $phar = $phar->convertToData(Phar::TAR);
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
 echo "================= convertToZip() =====================\n";
 
 $phar = $phar->convertToData(Phar::ZIP, Phar::NONE, '.1.zip');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
@@ -43,9 +43,9 @@ echo "================= convertToPhar() ====================\n";
 
 try {
 	$phar = $phar->convertToExecutable(Phar::PHAR);
-	var_dump($phar->isPhar());
-	var_dump($phar->isTar());
-	var_dump($phar->isZip());
+	var_dump($phar->isFileFormat(Phar::PHAR));
+	var_dump($phar->isFileFormat(Phar::TAR));
+	var_dump($phar->isFileFormat(Phar::ZIP));
 	var_dump(strlen($phar->getStub()));
 	var_dump($phar->getAlias());
 } catch(Exception $e) {
@@ -55,9 +55,9 @@ try {
 echo "================ convertToTar(GZ) ====================\n";
 
 $phar = $phar->convertToData(Phar::TAR, Phar::GZ, '.2.tar');
-var_dump($phar->isPhar());
-var_dump($phar->isTar());
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::PHAR));
+var_dump($phar->isFileFormat(Phar::TAR));
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 var_dump($phar->getAlias());
 
@@ -65,9 +65,9 @@ echo "================= convertToPhar() ====================\n";
 
 try {
 	$phar = $phar->convertToExecutable(Phar::PHAR);
-	var_dump($phar->isPhar());
-	var_dump($phar->isTar());
-	var_dump($phar->isZip());
+	var_dump($phar->isFileFormat(Phar::PHAR));
+	var_dump($phar->isFileFormat(Phar::TAR));
+	var_dump($phar->isFileFormat(Phar::ZIP));
 	var_dump(strlen($phar->getStub()));
 	var_dump($phar->getAlias());
 } catch(Exception $e) {
diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt
index 72e71ed793..d4031ec32f 100644
--- a/ext/phar/tests/phar_convert_tar.phpt
+++ b/ext/phar/tests/phar_convert_tar.phpt
@@ -23,17 +23,17 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 $phar = $phar->convertToExecutable(Phar::TAR);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 copy($fname2, $fname3);
 
 $phar = new Phar($fname3);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 ?>
diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index 78858aff12..f0f0f69825 100644
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -24,19 +24,19 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed());
 var_dump($phar->getStub());
 
 $phar = $phar->convertToExecutable(Phar::TAR, Phar::GZ);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed());
 var_dump($phar->getStub());
 
 copy($fname2, $fname3);
 
 $phar = new Phar($fname3);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed() == Phar::GZ);
 var_dump($phar->getStub());
 
diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt
index ac3f1fb201..52fd0f555a 100644
--- a/ext/phar/tests/phar_convert_tar3.phpt
+++ b/ext/phar/tests/phar_convert_tar3.phpt
@@ -24,19 +24,19 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed());
 var_dump($phar->getStub());
 
 $phar = $phar->convertToExecutable(Phar::TAR, Phar::BZ2);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed());
 var_dump($phar->getStub());
 
 copy($fname2 . '.bz2', $fname3);
 
 $phar = new Phar($fname3);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->isCompressed() == Phar::BZ2);
 var_dump($phar->getStub());
 
diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index 4615ab4c1c..b5e1de06f6 100644
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -23,17 +23,17 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 
 $phar = $phar->convertToExecutable(Phar::ZIP);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 
 copy($fname2, $fname3);
 
 $phar = new Phar($fname3);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 
 ?>
diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt
index e305c48367..1a61a2ef3b 100644
--- a/ext/phar/tests/phar_gzip.phpt
+++ b/ext/phar/tests/phar_gzip.phpt
@@ -36,7 +36,7 @@ $a = new Phar($fname);
 $a['test'] = 'hi';
 copy($fname, $fname2);
 $b = new Phar($fname2);
-var_dump($b->isPhar());
+var_dump($b->isFileFormat(Phar::PHAR));
 var_dump($b->isCompressed() == Phar::GZ);
 ?>
 ===DONE===
diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt
index 642e715012..8062fda769 100644
--- a/ext/phar/tests/tar/create_new_and_modify.phpt
+++ b/ext/phar/tests/tar/create_new_and_modify.phpt
@@ -16,7 +16,7 @@ $pname = 'phar://' . $fname;
 file_put_contents($pname . '/a.php', "brand new!\n");
 
 $phar = new Phar($fname);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 $sig1 = md5_file($fname);
 
 include $pname . '/a.php';
diff --git a/ext/phar/tests/tar/dir.phpt b/ext/phar/tests/tar/dir.phpt
index f04e5461f1..53bf65f9a7 100644
--- a/ext/phar/tests/tar/dir.phpt
+++ b/ext/phar/tests/tar/dir.phpt
@@ -14,7 +14,7 @@ $pname2 = 'phar://' . $fname2;
 $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname3 = 'phar://' . $fname3;
 $phar = new Phar($fname);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 
 $phar->addEmptyDir('test');
 var_dump($phar['test']->isDir());
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index 383e23bb4f..c990ff9b98 100755
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -7,7 +7,7 @@ phar.readonly=0
 --FILE--
 <?php
 $p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.tar', 0, 'brandnewphar.phar');
-var_dump($p->isTar());
+var_dump($p->isFileFormat(Phar::TAR));
 //var_dump($p->getStub());
 var_dump($p->isBuffering());
 $p->startBuffering();
diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
index 5432617e1c..b7d6d56f64 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt
@@ -39,7 +39,7 @@ try {
 	chdir(dirname(__FILE__));
 	$phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.tar');
 	var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt'))));
-	var_dump($phar->isTar());
+	var_dump($phar->isFileFormat(Phar::TAR));
 } catch (Exception $e) {
 	var_dump(get_class($e));
 	echo $e->getMessage() . "\n";
diff --git a/ext/phar/tests/tar/phar_buildfromiterator8.phpt b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
index 291fd951f2..f42640f692 100644
--- a/ext/phar/tests/tar/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/tar/phar_buildfromiterator8.phpt
@@ -12,7 +12,7 @@ try {
 	$a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), dirname(__FILE__) . DIRECTORY_SEPARATOR);
 	asort($a);
 	var_dump($a);
-	var_dump($phar->isTar());
+	var_dump($phar->isFileFormat(Phar::TAR));
 } catch (Exception $e) {
 	var_dump(get_class($e));
 	echo $e->getMessage() . "\n";
diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt
index 874ce5f573..b926b9a081 100644
--- a/ext/phar/tests/tar/phar_commitwrite.phpt
+++ b/ext/phar/tests/tar/phar_commitwrite.phpt
@@ -21,7 +21,7 @@ include 'phar://brandnewphar.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 var_dump($p->getStub());
-var_dump($p->isTar());
+var_dump($p->isFileFormat(Phar::TAR));
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index 216c353dd4..6a7d78ea8b 100644
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -15,23 +15,23 @@ $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
 $phar = new Phar($fname);
 $phar['a.txt'] = 'some text';
 $phar->stopBuffering();
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump(strlen($phar->getStub()));
 
 $phar = $phar->convertToExecutable(Phar::TAR);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 $phar['a'] = 'hi there';
 
 $phar = $phar->convertToExecutable(Phar::PHAR, Phar::NONE, '.3.phar');
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump(strlen($phar->getStub()));
 
 copy($fname3, $fname2);
 
 $phar = new Phar($fname2);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump(strlen($phar->getStub()));
 
 ?>
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index e79c0fe91f..496948b14c 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -15,24 +15,24 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 $phar = new Phar($fname);
 $phar['a.txt'] = 'some text';
 $phar->stopBuffering();
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump(strlen($phar->getStub()));
 
 $phar = $phar->convertToExecutable(Phar::TAR);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 $phar['a'] = 'hi there';
 
 $phar = $phar->convertToExecutable(Phar::PHAR, Phar::GZ);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump($phar->isCompressed());
 var_dump(strlen($phar->getStub()));
 
 copy($fname . '.gz', $fname2);
 
 $phar = new Phar($fname2);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump($phar->isCompressed() == Phar::GZ);
 var_dump(strlen($phar->getStub()));
 
diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index e4155deb3b..f4768194d1 100644
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -15,24 +15,24 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 $phar = new Phar($fname);
 $phar['a.txt'] = 'some text';
 $phar->stopBuffering();
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump(strlen($phar->getStub()));
 
 $phar = $phar->convertToExecutable(Phar::TAR);
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 var_dump($phar->getStub());
 
 $phar['a'] = 'hi there';
 
 $phar = $phar->convertToExecutable(Phar::PHAR, Phar::BZ2);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump($phar->isCompressed());
 var_dump(strlen($phar->getStub()));
 
 copy($fname . '.bz2', $fname2);
 
 $phar = new Phar($fname2);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump($phar->isCompressed() == Phar::BZ2);
 var_dump(strlen($phar->getStub()));
 
diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt
index fcb3f498aa..ed5cdac8bc 100644
--- a/ext/phar/tests/tar/phar_copy.phpt
+++ b/ext/phar/tests/tar/phar_copy.phpt
@@ -29,7 +29,7 @@ try
 	$p->stopBuffering();
 	echo file_get_contents($p['c']->getPathName());
 	copy($fname, $fname2);
-	var_dump($p->isTar());
+	var_dump($p->isFileFormat(Phar::TAR));
 	$p->copy('a', $ename);
 }
 catch(Exception $e)
@@ -38,7 +38,7 @@ catch(Exception $e)
 }
 ini_set('phar.readonly',1);
 $p2 = new Phar($fname2);
-var_dump($p2->isTar());
+var_dump($p2->isFileFormat(Phar::TAR));
 echo "\n";
 echo 'a: ' , file_get_contents($p2['a']->getPathName());
 echo 'b: ' ,file_get_contents($p2['b']->getPathName());
diff --git a/ext/phar/tests/tar/phar_magic.phpt b/ext/phar/tests/tar/phar_magic.phpt
index 6af907174d..1bb336f96c 100644
--- a/ext/phar/tests/tar/phar_magic.phpt
+++ b/ext/phar/tests/tar/phar_magic.phpt
@@ -9,7 +9,7 @@ phar.readonly=0
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar.php';
 $p = new Phar($fname);
-var_dump($p->isTar());
+var_dump($p->isFileFormat(Phar::TAR));
 $p['a'] = '<?php include "b/c.php";' . "\n";
 $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("a", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";';
 $p['d'] = "in d\n";
diff --git a/ext/phar/tests/tar/tar_bz2.phpt b/ext/phar/tests/tar/tar_bz2.phpt
index 8c34fbc98a..ad14541431 100644
--- a/ext/phar/tests/tar/tar_bz2.phpt
+++ b/ext/phar/tests/tar/tar_bz2.phpt
@@ -36,7 +36,7 @@ $phar['test'] = 'hi';
 copy($fname, $fname2);
 
 $phar2 = new Phar($fname2);
-var_dump($phar2->isTar());
+var_dump($phar2->isFileFormat(Phar::TAR));
 var_dump($phar2->isCompressed() == Phar::BZ2);
 
 ?>
diff --git a/ext/phar/tests/tar/tar_gzip.phpt b/ext/phar/tests/tar/tar_gzip.phpt
index a7fcb7c228..8287ee7f06 100644
--- a/ext/phar/tests/tar/tar_gzip.phpt
+++ b/ext/phar/tests/tar/tar_gzip.phpt
@@ -34,7 +34,7 @@ $a = new Phar($fname);
 $a['test'] = 'hi';
 copy($fname, $fname2);
 $b = new Phar($fname2);
-var_dump($b->isTar());
+var_dump($b->isFileFormat(Phar::TAR));
 var_dump($b->isCompressed() == Phar::GZ);
 ?>
 ===DONE===
diff --git a/ext/phar/tests/tar/tar_makebz2.phpt b/ext/phar/tests/tar/tar_makebz2.phpt
index e87019b6a1..f703b46924 100644
--- a/ext/phar/tests/tar/tar_makebz2.phpt
+++ b/ext/phar/tests/tar/tar_makebz2.phpt
@@ -15,13 +15,13 @@ $fname3 = dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2';
 
 $phar = new Phar($fname);
 $phar['test'] = 'hi';
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 $phar = $phar->compress(Phar::BZ2);
 
 copy($fname2, $fname3);
 
 $phar2 = new Phar($fname3);
-var_dump($phar2->isTar());
+var_dump($phar2->isFileFormat(Phar::TAR));
 var_dump($phar2->isCompressed() == Phar::BZ2);
 
 ?>
diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt
index ae38cfeb36..46fe177611 100644
--- a/ext/phar/tests/tar/tar_makegz.phpt
+++ b/ext/phar/tests/tar/tar_makegz.phpt
@@ -15,14 +15,14 @@ $fname3 = dirname(__FILE__) . '/tar_makegz_b.phar.tar.gz';
 
 $phar = new Phar($fname);
 $phar['test'] = 'hi';
-var_dump($phar->isTar());
+var_dump($phar->isFileFormat(Phar::TAR));
 $phar = $phar->compress(Phar::GZ);
 
 
 copy($fname2, $fname3);
 
 $phar2 = new Phar($fname3);
-var_dump($phar2->isTar());
+var_dump($phar2->isFileFormat(Phar::TAR));
 var_dump($phar2->isCompressed() == Phar::GZ);
 
 ?>
diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt
index b81e5a779f..5a3ec3317b 100644
--- a/ext/phar/tests/zip/create_new_and_modify.phpt
+++ b/ext/phar/tests/zip/create_new_and_modify.phpt
@@ -16,7 +16,7 @@ $pname = 'phar://' . $fname;
 file_put_contents($pname . '/a.php', "brand new!\n");
 
 $phar = new Phar($fname);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 $sig1 = md5_file($fname);
 
 include $pname . '/a.php';
diff --git a/ext/phar/tests/zip/dir.phpt b/ext/phar/tests/zip/dir.phpt
index 210b9b816e..3cbeacd1c1 100644
--- a/ext/phar/tests/zip/dir.phpt
+++ b/ext/phar/tests/zip/dir.phpt
@@ -14,7 +14,7 @@ $pname2 = 'phar://' . $fname2;
 $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname3 = 'phar://' . $fname3;
 $phar = new Phar($fname);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 
 $phar->addEmptyDir('test');
 var_dump($phar['test']->isDir());
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index 9376e49563..81cf4001c3 100755
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -7,7 +7,7 @@ phar.readonly=0
 --FILE--
 <?php
 $p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.zip', 0, 'brandnewphar.phar');
-var_dump($p->isZip());
+var_dump($p->isFileFormat(Phar::ZIP));
 //var_dump($p->getStub());
 var_dump($p->isBuffering());
 $p->startBuffering();
diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
index fe402b6b45..cc11fe5537 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt
@@ -39,7 +39,7 @@ try {
 	chdir(dirname(__FILE__));
 	$phar = new Phar(dirname(__FILE__) . '/buildfromiterator.phar.zip');
 	var_dump($phar->buildFromIterator(new myIterator(array('a' => basename(__FILE__, 'php') . 'phpt'))));
-	var_dump($phar->isZip());
+	var_dump($phar->isFileFormat(Phar::ZIP));
 } catch (Exception $e) {
 	var_dump(get_class($e));
 	echo $e->getMessage() . "\n";
diff --git a/ext/phar/tests/zip/phar_buildfromiterator8.phpt b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
index 0222dc8b4f..d2b1be2087 100644
--- a/ext/phar/tests/zip/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/zip/phar_buildfromiterator8.phpt
@@ -12,7 +12,7 @@ try {
 	$a = $phar->buildFromIterator(new RegexIterator(new DirectoryIterator('.'), '/^frontcontroller\d{0,2}\.phar\.phpt\\z|^\.\\z|^\.\.\\z/'), dirname(__FILE__) . DIRECTORY_SEPARATOR);
 	asort($a);
 	var_dump($a);
-	var_dump($phar->isZip());
+	var_dump($phar->isFileFormat(Phar::ZIP));
 } catch (Exception $e) {
 	var_dump(get_class($e));
 	echo $e->getMessage() . "\n";
diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt
index 9a371eaac5..84bccb9fae 100644
--- a/ext/phar/tests/zip/phar_commitwrite.phpt
+++ b/ext/phar/tests/zip/phar_commitwrite.phpt
@@ -21,7 +21,7 @@ include 'phar://brandnewphar.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 var_dump($p->getStub());
-var_dump($p->isZip());
+var_dump($p->isFileFormat(Phar::ZIP));
 ?>
 ===DONE===
 --CLEAN--
diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index dcc0dd1f09..815656dbf6 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -15,23 +15,23 @@ $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
 $phar = new Phar($fname);
 $phar['a.txt'] = 'some text';
 $phar->stopBuffering();
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump(strlen($phar->getStub()));
 
 $phar = $phar->convertToExecutable(Phar::ZIP);
-var_dump($phar->isZip());
+var_dump($phar->isFileFormat(Phar::ZIP));
 var_dump($phar->getStub());
 
 $phar['a'] = 'hi there';
 
 $phar = $phar->convertToExecutable(Phar::PHAR, Phar::NONE, '.3.phar');
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump(strlen($phar->getStub()));
 
 copy($fname3, $fname2);
 
 $phar = new Phar($fname2);
-var_dump($phar->isPhar());
+var_dump($phar->isFileFormat(Phar::PHAR));
 var_dump(strlen($phar->getStub()));
 
 ?>
diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt
index 199abc8305..14034c92c0 100644
--- a/ext/phar/tests/zip/phar_copy.phpt
+++ b/ext/phar/tests/zip/phar_copy.phpt
@@ -28,7 +28,7 @@ try
 	$p->stopBuffering();
 	echo file_get_contents($p['c']->getPathName());
 	copy($fname, $fname2);
-	var_dump($p->isZip());
+	var_dump($p->isFileFormat(Phar::ZIP));
 	$p->copy('a', $ename);
 }
 catch(Exception $e)
@@ -37,7 +37,7 @@ catch(Exception $e)
 }
 ini_set('phar.readonly',1);
 $p2 = new Phar($fname2);
-var_dump($p2->isZip());
+var_dump($p2->isFileFormat(Phar::ZIP));
 echo "\n";
 echo 'a: ' , file_get_contents($p2['a']->getPathName());
 echo 'b: ' ,file_get_contents($p2['b']->getPathName());
diff --git a/ext/phar/tests/zip/phar_magic.phpt b/ext/phar/tests/zip/phar_magic.phpt
index 1ac101ec75..4a17207376 100644
--- a/ext/phar/tests/zip/phar_magic.phpt
+++ b/ext/phar/tests/zip/phar_magic.phpt
@@ -9,7 +9,7 @@ phar.readonly=0
 <?php
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.zip.php';
 $p = new Phar($fname);
-var_dump($p->isZip());
+var_dump($p->isFileFormat(Phar::ZIP));
 $p['a'] = '<?php include "b/c.php";' . "\n";
 $p['b/c.php'] = '<?php echo "in b\n";$a = fopen("a", "r", true);echo stream_get_contents($a);fclose($a);include dirname(__FILE__) . "/../d";';
 $p['d'] = "in d\n";