cellog Fri May 2 05:05:55 2008 UTC
Modified files:
/pecl/phar phar_object.c
/pecl/phar/tests dir.phpt phar_bz2.phpt phar_convert_repeated.phpt
phar_convert_repeated_b.phpt phar_convert_tar.phpt
phar_convert_tar2.phpt phar_convert_tar3.phpt
phar_convert_zip.phpt phar_gzip.phpt
/pecl/phar/tests/tar create_new_and_modify.phpt dir.phpt
phar_begin_setstub_commit.phpt
phar_buildfromiterator4.phpt
phar_buildfromiterator8.phpt
phar_commitwrite.phpt phar_convert_phar.phpt
phar_convert_phar2.phpt
phar_convert_phar3.phpt phar_copy.phpt
phar_magic.phpt tar_bz2.phpt tar_gzip.phpt
tar_makebz2.phpt tar_makegz.phpt
/pecl/phar/tests/zip create_new_and_modify.phpt dir.phpt
phar_begin_setstub_commit.phpt
phar_buildfromiterator4.phpt
phar_buildfromiterator8.phpt
phar_commitwrite.phpt phar_convert_phar.phpt
phar_copy.phpt phar_magic.phpt
Log:
refactor isTar/isZip/isPhar into isFileFormat(int format) where format is one
of Phar::TAR,, Phar::ZIP, Phar::PHAR
[DOC]
http://cvs.php.net/viewvc.cgi/pecl/phar/phar_object.c?r1=1.253&r2=1.254&diff_format=u
Index: pecl/phar/phar_object.c
diff -u pecl/phar/phar_object.c:1.253 pecl/phar/phar_object.c:1.254
--- pecl/phar/phar_object.c:1.253 Fri May 2 04:44:38 2008
+++ pecl/phar/phar_object.c Fri May 2 05:05:54 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.253 2008/05/02 04:44:38 cellog Exp $ */
+/* $Id: phar_object.c,v 1.254 2008/05/02 05:05:54 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -1682,36 +1682,28 @@
}
/* }}} */
-/* {{{ 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_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 @@
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)
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/dir.phpt?r1=1.14&r2=1.15&diff_format=u
Index: pecl/phar/tests/dir.phpt
diff -u pecl/phar/tests/dir.phpt:1.14 pecl/phar/tests/dir.phpt:1.15
--- pecl/phar/tests/dir.phpt:1.14 Fri Apr 18 04:13:12 2008
+++ pecl/phar/tests/dir.phpt Fri May 2 05:05:54 2008
@@ -14,7 +14,7 @@
$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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_bz2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/phar_bz2.phpt
diff -u pecl/phar/tests/phar_bz2.phpt:1.2 pecl/phar/tests/phar_bz2.phpt:1.3
--- pecl/phar/tests/phar_bz2.phpt:1.2 Wed Feb 20 13:11:38 2008
+++ pecl/phar/tests/phar_bz2.phpt Fri May 2 05:05:54 2008
@@ -35,8 +35,15 @@
$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(%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
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_repeated.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/phar_convert_repeated.phpt
diff -u pecl/phar/tests/phar_convert_repeated.phpt:1.5
pecl/phar/tests/phar_convert_repeated.phpt:1.6
--- pecl/phar/tests/phar_convert_repeated.phpt:1.5 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_repeated.phpt Fri May 2 05:05:54 2008
@@ -24,63 +24,63 @@
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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_repeated_b.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/phar_convert_repeated_b.phpt
diff -u pecl/phar/tests/phar_convert_repeated_b.phpt:1.5
pecl/phar/tests/phar_convert_repeated_b.phpt:1.6
--- pecl/phar/tests/phar_convert_repeated_b.phpt:1.5 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_repeated_b.phpt Fri May 2 05:05:54 2008
@@ -15,27 +15,27 @@
$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 @@
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 @@
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 @@
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) {
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_tar.phpt?r1=1.6&r2=1.7&diff_format=u
Index: pecl/phar/tests/phar_convert_tar.phpt
diff -u pecl/phar/tests/phar_convert_tar.phpt:1.6
pecl/phar/tests/phar_convert_tar.phpt:1.7
--- pecl/phar/tests/phar_convert_tar.phpt:1.6 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_tar.phpt Fri May 2 05:05:54 2008
@@ -23,17 +23,17 @@
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());
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_tar2.phpt?r1=1.11&r2=1.12&diff_format=u
Index: pecl/phar/tests/phar_convert_tar2.phpt
diff -u pecl/phar/tests/phar_convert_tar2.phpt:1.11
pecl/phar/tests/phar_convert_tar2.phpt:1.12
--- pecl/phar/tests/phar_convert_tar2.phpt:1.11 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_tar2.phpt Fri May 2 05:05:54 2008
@@ -24,19 +24,19 @@
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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_tar3.phpt?r1=1.10&r2=1.11&diff_format=u
Index: pecl/phar/tests/phar_convert_tar3.phpt
diff -u pecl/phar/tests/phar_convert_tar3.phpt:1.10
pecl/phar/tests/phar_convert_tar3.phpt:1.11
--- pecl/phar/tests/phar_convert_tar3.phpt:1.10 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_tar3.phpt Fri May 2 05:05:54 2008
@@ -24,19 +24,19 @@
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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_convert_zip.phpt?r1=1.8&r2=1.9&diff_format=u
Index: pecl/phar/tests/phar_convert_zip.phpt
diff -u pecl/phar/tests/phar_convert_zip.phpt:1.8
pecl/phar/tests/phar_convert_zip.phpt:1.9
--- pecl/phar/tests/phar_convert_zip.phpt:1.8 Fri Apr 11 04:20:14 2008
+++ pecl/phar/tests/phar_convert_zip.phpt Fri May 2 05:05:54 2008
@@ -23,17 +23,17 @@
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());
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_gzip.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/phar_gzip.phpt
diff -u pecl/phar/tests/phar_gzip.phpt:1.2 pecl/phar/tests/phar_gzip.phpt:1.3
--- pecl/phar/tests/phar_gzip.phpt:1.2 Wed Feb 20 13:11:38 2008
+++ pecl/phar/tests/phar_gzip.phpt Fri May 2 05:05:54 2008
@@ -36,7 +36,7 @@
$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===
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/create_new_and_modify.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/tests/tar/create_new_and_modify.phpt
diff -u pecl/phar/tests/tar/create_new_and_modify.phpt:1.1
pecl/phar/tests/tar/create_new_and_modify.phpt:1.2
--- pecl/phar/tests/tar/create_new_and_modify.phpt:1.1 Mon Jan 7 05:35:16 2008
+++ pecl/phar/tests/tar/create_new_and_modify.phpt Fri May 2 05:05:54 2008
@@ -16,7 +16,7 @@
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';
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/dir.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/tar/dir.phpt
diff -u pecl/phar/tests/tar/dir.phpt:1.2 pecl/phar/tests/tar/dir.phpt:1.3
--- pecl/phar/tests/tar/dir.phpt:1.2 Wed Apr 9 19:23:30 2008
+++ pecl/phar/tests/tar/dir.phpt Fri May 2 05:05:54 2008
@@ -14,7 +14,7 @@
$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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_begin_setstub_commit.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/tests/tar/phar_begin_setstub_commit.phpt
diff -u pecl/phar/tests/tar/phar_begin_setstub_commit.phpt:1.1
pecl/phar/tests/tar/phar_begin_setstub_commit.phpt:1.2
--- pecl/phar/tests/tar/phar_begin_setstub_commit.phpt:1.1 Mon Jan 7
17:58:30 2008
+++ pecl/phar/tests/tar/phar_begin_setstub_commit.phpt Fri May 2 05:05:54 2008
@@ -7,7 +7,7 @@
--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();
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_buildfromiterator4.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/tests/tar/phar_buildfromiterator4.phpt
diff -u pecl/phar/tests/tar/phar_buildfromiterator4.phpt:1.1
pecl/phar/tests/tar/phar_buildfromiterator4.phpt:1.2
--- pecl/phar/tests/tar/phar_buildfromiterator4.phpt:1.1 Mon Jan 7
18:07:09 2008
+++ pecl/phar/tests/tar/phar_buildfromiterator4.phpt Fri May 2 05:05:54 2008
@@ -39,7 +39,7 @@
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";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_buildfromiterator8.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/tests/tar/phar_buildfromiterator8.phpt
diff -u pecl/phar/tests/tar/phar_buildfromiterator8.phpt:1.1
pecl/phar/tests/tar/phar_buildfromiterator8.phpt:1.2
--- pecl/phar/tests/tar/phar_buildfromiterator8.phpt:1.1 Mon Jan 7
18:07:09 2008
+++ pecl/phar/tests/tar/phar_buildfromiterator8.phpt Fri May 2 05:05:54 2008
@@ -12,7 +12,7 @@
$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";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_commitwrite.phpt?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/tests/tar/phar_commitwrite.phpt
diff -u pecl/phar/tests/tar/phar_commitwrite.phpt:1.1
pecl/phar/tests/tar/phar_commitwrite.phpt:1.2
--- pecl/phar/tests/tar/phar_commitwrite.phpt:1.1 Mon Jan 7 22:21:09 2008
+++ pecl/phar/tests/tar/phar_commitwrite.phpt Fri May 2 05:05:54 2008
@@ -21,7 +21,7 @@
__HALT_COMPILER();
?>");
var_dump($p->getStub());
-var_dump($p->isTar());
+var_dump($p->isFileFormat(Phar::TAR));
?>
===DONE===
--CLEAN--
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_convert_phar.phpt?r1=1.8&r2=1.9&diff_format=u
Index: pecl/phar/tests/tar/phar_convert_phar.phpt
diff -u pecl/phar/tests/tar/phar_convert_phar.phpt:1.8
pecl/phar/tests/tar/phar_convert_phar.phpt:1.9
--- pecl/phar/tests/tar/phar_convert_phar.phpt:1.8 Tue Apr 29 12:26:57 2008
+++ pecl/phar/tests/tar/phar_convert_phar.phpt Fri May 2 05:05:54 2008
@@ -15,23 +15,23 @@
$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()));
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_convert_phar2.phpt?r1=1.10&r2=1.11&diff_format=u
Index: pecl/phar/tests/tar/phar_convert_phar2.phpt
diff -u pecl/phar/tests/tar/phar_convert_phar2.phpt:1.10
pecl/phar/tests/tar/phar_convert_phar2.phpt:1.11
--- pecl/phar/tests/tar/phar_convert_phar2.phpt:1.10 Tue Apr 29 12:26:57 2008
+++ pecl/phar/tests/tar/phar_convert_phar2.phpt Fri May 2 05:05:54 2008
@@ -15,24 +15,24 @@
$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()));
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_convert_phar3.phpt?r1=1.10&r2=1.11&diff_format=u
Index: pecl/phar/tests/tar/phar_convert_phar3.phpt
diff -u pecl/phar/tests/tar/phar_convert_phar3.phpt:1.10
pecl/phar/tests/tar/phar_convert_phar3.phpt:1.11
--- pecl/phar/tests/tar/phar_convert_phar3.phpt:1.10 Tue Apr 29 12:26:57 2008
+++ pecl/phar/tests/tar/phar_convert_phar3.phpt Fri May 2 05:05:54 2008
@@ -15,24 +15,24 @@
$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()));
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_copy.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/tar/phar_copy.phpt
diff -u pecl/phar/tests/tar/phar_copy.phpt:1.2
pecl/phar/tests/tar/phar_copy.phpt:1.3
--- pecl/phar/tests/tar/phar_copy.phpt:1.2 Wed Jan 9 00:58:36 2008
+++ pecl/phar/tests/tar/phar_copy.phpt Fri May 2 05:05:54 2008
@@ -29,7 +29,7 @@
$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 @@
}
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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/phar_magic.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/tar/phar_magic.phpt
diff -u pecl/phar/tests/tar/phar_magic.phpt:1.2
pecl/phar/tests/tar/phar_magic.phpt:1.3
--- pecl/phar/tests/tar/phar_magic.phpt:1.2 Wed Mar 12 03:55:11 2008
+++ pecl/phar/tests/tar/phar_magic.phpt Fri May 2 05:05:54 2008
@@ -9,7 +9,7 @@
<?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";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/tar_bz2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: pecl/phar/tests/tar/tar_bz2.phpt
diff -u pecl/phar/tests/tar/tar_bz2.phpt:1.2
pecl/phar/tests/tar/tar_bz2.phpt:1.3
--- pecl/phar/tests/tar/tar_bz2.phpt:1.2 Tue Feb 12 16:39:58 2008
+++ pecl/phar/tests/tar/tar_bz2.phpt Fri May 2 05:05:54 2008
@@ -36,7 +36,7 @@
copy($fname, $fname2);
$phar2 = new Phar($fname2);
-var_dump($phar2->isTar());
+var_dump($phar2->isFileFormat(Phar::TAR));
var_dump($phar2->isCompressed() == Phar::BZ2);
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/tar_gzip.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/tar/tar_gzip.phpt
diff -u pecl/phar/tests/tar/tar_gzip.phpt:1.3
pecl/phar/tests/tar/tar_gzip.phpt:1.4
--- pecl/phar/tests/tar/tar_gzip.phpt:1.3 Tue Feb 12 16:39:58 2008
+++ pecl/phar/tests/tar/tar_gzip.phpt Fri May 2 05:05:54 2008
@@ -34,7 +34,7 @@
$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===
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/tar_makebz2.phpt?r1=1.7&r2=1.8&diff_format=u
Index: pecl/phar/tests/tar/tar_makebz2.phpt
diff -u pecl/phar/tests/tar/tar_makebz2.phpt:1.7
pecl/phar/tests/tar/tar_makebz2.phpt:1.8
--- pecl/phar/tests/tar/tar_makebz2.phpt:1.7 Mon Apr 14 15:58:11 2008
+++ pecl/phar/tests/tar/tar_makebz2.phpt Fri May 2 05:05:54 2008
@@ -15,13 +15,13 @@
$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);
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/tar/tar_makegz.phpt?r1=1.8&r2=1.9&diff_format=u
Index: pecl/phar/tests/tar/tar_makegz.phpt
diff -u pecl/phar/tests/tar/tar_makegz.phpt:1.8
pecl/phar/tests/tar/tar_makegz.phpt:1.9
--- pecl/phar/tests/tar/tar_makegz.phpt:1.8 Mon Apr 14 15:58:11 2008
+++ pecl/phar/tests/tar/tar_makegz.phpt Fri May 2 05:05:54 2008
@@ -15,14 +15,14 @@
$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);
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/create_new_and_modify.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/zip/create_new_and_modify.phpt
diff -u pecl/phar/tests/zip/create_new_and_modify.phpt:1.3
pecl/phar/tests/zip/create_new_and_modify.phpt:1.4
--- pecl/phar/tests/zip/create_new_and_modify.phpt:1.3 Mon Jan 28 16:49:27 2008
+++ pecl/phar/tests/zip/create_new_and_modify.phpt Fri May 2 05:05:54 2008
@@ -16,7 +16,7 @@
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';
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/dir.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/zip/dir.phpt
diff -u pecl/phar/tests/zip/dir.phpt:1.4 pecl/phar/tests/zip/dir.phpt:1.5
--- pecl/phar/tests/zip/dir.phpt:1.4 Wed Apr 9 19:23:30 2008
+++ pecl/phar/tests/zip/dir.phpt Fri May 2 05:05:54 2008
@@ -14,7 +14,7 @@
$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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_begin_setstub_commit.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/zip/phar_begin_setstub_commit.phpt
diff -u pecl/phar/tests/zip/phar_begin_setstub_commit.phpt:1.5
pecl/phar/tests/zip/phar_begin_setstub_commit.phpt:1.6
--- pecl/phar/tests/zip/phar_begin_setstub_commit.phpt:1.5 Sat Apr 26
17:28:27 2008
+++ pecl/phar/tests/zip/phar_begin_setstub_commit.phpt Fri May 2 05:05:54 2008
@@ -7,7 +7,7 @@
--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();
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_buildfromiterator4.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/zip/phar_buildfromiterator4.phpt
diff -u pecl/phar/tests/zip/phar_buildfromiterator4.phpt:1.3
pecl/phar/tests/zip/phar_buildfromiterator4.phpt:1.4
--- pecl/phar/tests/zip/phar_buildfromiterator4.phpt:1.3 Mon Jan 28
16:31:55 2008
+++ pecl/phar/tests/zip/phar_buildfromiterator4.phpt Fri May 2 05:05:54 2008
@@ -39,7 +39,7 @@
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";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_buildfromiterator8.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/zip/phar_buildfromiterator8.phpt
diff -u pecl/phar/tests/zip/phar_buildfromiterator8.phpt:1.3
pecl/phar/tests/zip/phar_buildfromiterator8.phpt:1.4
--- pecl/phar/tests/zip/phar_buildfromiterator8.phpt:1.3 Mon Jan 28
16:31:55 2008
+++ pecl/phar/tests/zip/phar_buildfromiterator8.phpt Fri May 2 05:05:54 2008
@@ -12,7 +12,7 @@
$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";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_commitwrite.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/zip/phar_commitwrite.phpt
diff -u pecl/phar/tests/zip/phar_commitwrite.phpt:1.3
pecl/phar/tests/zip/phar_commitwrite.phpt:1.4
--- pecl/phar/tests/zip/phar_commitwrite.phpt:1.3 Mon Jan 28 08:52:07 2008
+++ pecl/phar/tests/zip/phar_commitwrite.phpt Fri May 2 05:05:54 2008
@@ -21,7 +21,7 @@
__HALT_COMPILER();
?>");
var_dump($p->getStub());
-var_dump($p->isZip());
+var_dump($p->isFileFormat(Phar::ZIP));
?>
===DONE===
--CLEAN--
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_convert_phar.phpt?r1=1.11&r2=1.12&diff_format=u
Index: pecl/phar/tests/zip/phar_convert_phar.phpt
diff -u pecl/phar/tests/zip/phar_convert_phar.phpt:1.11
pecl/phar/tests/zip/phar_convert_phar.phpt:1.12
--- pecl/phar/tests/zip/phar_convert_phar.phpt:1.11 Tue Apr 29 12:26:57 2008
+++ pecl/phar/tests/zip/phar_convert_phar.phpt Fri May 2 05:05:54 2008
@@ -15,23 +15,23 @@
$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()));
?>
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_copy.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/zip/phar_copy.phpt
diff -u pecl/phar/tests/zip/phar_copy.phpt:1.4
pecl/phar/tests/zip/phar_copy.phpt:1.5
--- pecl/phar/tests/zip/phar_copy.phpt:1.4 Mon Jan 28 08:52:07 2008
+++ pecl/phar/tests/zip/phar_copy.phpt Fri May 2 05:05:54 2008
@@ -28,7 +28,7 @@
$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 @@
}
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());
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/zip/phar_magic.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/zip/phar_magic.phpt
diff -u pecl/phar/tests/zip/phar_magic.phpt:1.4
pecl/phar/tests/zip/phar_magic.phpt:1.5
--- pecl/phar/tests/zip/phar_magic.phpt:1.4 Wed Mar 12 03:55:11 2008
+++ pecl/phar/tests/zip/phar_magic.phpt Fri May 2 05:05:55 2008
@@ -9,7 +9,7 @@
<?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";
