cvs: pecl /phar TODO phar_object.c /phar/tests phar_oo_006.phpt phar_oo_007.phpt phar_oo_008.phpt phar_oo_009.phpt phar_oo_011.phpt phar_oo_012.phpt phar_oo_012_confirm.phpt phar_oo_012b.phpt

helly           Sun Jan 21 17:40:26 2007 UTC

  Modified files:              
    /pecl/phar  TODO phar_object.c 
    /pecl/phar/tests    phar_oo_006.phpt phar_oo_007.phpt phar_oo_008.phpt 
                        phar_oo_009.phpt phar_oo_011.phpt phar_oo_012.phpt 
                        phar_oo_012_confirm.phpt phar_oo_012b.phpt 
  Log:
  - Per defautl class Phar returns Info class on offsetGet()
  
http://cvs.php.net/viewvc.cgi/pecl/phar/TODO?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/TODO
diff -u pecl/phar/TODO:1.5 pecl/phar/TODO:1.6
--- pecl/phar/TODO:1.5  Sun Jan 21 15:25:49 2007
+++ pecl/phar/TODO      Sun Jan 21 17:40:26 2007
@@ -5,8 +5,7 @@
    enabling it on PHP_INI_ALL if it is disabled in the system, but does not 
    allow disabling it if it is enabled in the system [Greg]
  X implement reading in metadata in manifest as [type32][len16][metadata...] 
-   where 0 type is
-   used to finish metadata for this file [Greg]
+   where 0 type is used to finish metadata for this file [Greg]
  * implement writing out of metadata to new manifest
  X if SPL is disabled, enable only static methods of class Phar and disable 
    class PharFileInfo completley [Marcus]
@@ -14,8 +13,9 @@
    have a handle opened for writing
  * docs on file format/manifest description
  * docs on uses
- * support stream context for specifying compression of a file, as well as 
-   meta-data, and copying of new prologue to the phar
+ * stream context for specifying compression of a file
+ * stream context for specifying meta-data
+ * stream context for specifying a new prologue to the phar
  * add setUncompressed(), setCompressedGZ() and setCompressedBZ2() to 
    PharFileInfo class
  * add uncompressAllFiles(), compressAllFilesGZ() and compressAllFilesBZ2() 
@@ -24,6 +24,7 @@
  * add getMetaData($key = null) to PharFileInfo
  * always throw exceptions from the Phar object, and E_RECOVERABLE_ERROR from 
    streams interface
+ * ability to have Phar object return file class as offsetGet() result
  
 Version 1.1.0
 
http://cvs.php.net/viewvc.cgi/pecl/phar/phar_object.c?r1=1.1&r2=1.2&diff_format=u
Index: pecl/phar/phar_object.c
diff -u pecl/phar/phar_object.c:1.1 pecl/phar/phar_object.c:1.2
--- pecl/phar/phar_object.c:1.1 Sun Jan 21 15:25:49 2007
+++ pecl/phar/phar_object.c     Sun Jan 21 17:40:26 2007
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_object.c,v 1.1 2007/01/21 15:25:49 helly Exp $ */
+/* $Id: phar_object.c,v 1.2 2007/01/21 17:40:26 helly Exp $ */
 
 #include "phar_internal.h"
 
@@ -285,7 +285,7 @@
                fname_len = spprintf(&fname, 0, "phar://%s/%s", 
phar_obj->arc.archive->fname, fname);
                MAKE_STD_ZVAL(zfname);
                ZVAL_STRINGL(zfname, fname, fname_len, 0);
-               spl_instantiate_arg_ex1(phar_obj->spl.file_class, 
&return_value, 0, zfname TSRMLS_CC);
+               spl_instantiate_arg_ex1(phar_obj->spl.info_class, 
&return_value, 0, zfname TSRMLS_CC);
                zval_ptr_dtor(&zfname);
        }
 
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_006.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/phar_oo_006.phpt
diff -u pecl/phar/tests/phar_oo_006.phpt:1.4 
pecl/phar/tests/phar_oo_006.phpt:1.5
--- pecl/phar/tests/phar_oo_006.phpt:1.4        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_006.phpt    Sun Jan 21 17:40:26 2007
@@ -28,7 +28,7 @@
 {
        echo $e->getMessage() . "\n";
 }
-$phar->setFileClass('MyFile');
+$phar->setInfoClass('MyFile');
 
 echo $phar['a.php']->getFilename() . "\n";
 echo $phar['b/c.php']->getFilename() . "\n";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_007.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/phar_oo_007.phpt
diff -u pecl/phar/tests/phar_oo_007.phpt:1.3 
pecl/phar/tests/phar_oo_007.phpt:1.4
--- pecl/phar/tests/phar_oo_007.phpt:1.3        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_007.phpt    Sun Jan 21 17:40:26 2007
@@ -20,7 +20,7 @@
 }
 
 $phar = new Phar($fname);
-$phar->setFileClass('MyFile');
+$phar->setInfoClass('MyFile');
 
 $f = $phar['a.php'];
 
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_008.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/phar_oo_008.phpt
diff -u pecl/phar/tests/phar_oo_008.phpt:1.5 
pecl/phar/tests/phar_oo_008.phpt:1.6
--- pecl/phar/tests/phar_oo_008.phpt:1.5        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_008.phpt    Sun Jan 21 17:40:26 2007
@@ -13,7 +13,7 @@
 require_once 'phar_oo_test.inc';
 
 $phar = new Phar($fname);
-$phar->setFileClass('SplFileObject');
+$phar->setInfoClass('SplFileObject');
 
 $f = $phar['a.csv'];
 echo "===1===\n";
@@ -38,7 +38,7 @@
        }
 }
 
-$phar->setFileClass('MyCSVFile');
+$phar->setInfoClass('MyCSVFile');
 $v = $phar['a.csv'];
 
 echo "===3===\n";
@@ -70,7 +70,7 @@
        }
 }
 
-$phar->setFileClass('MyCSVFile2');
+$phar->setInfoClass('MyCSVFile2');
 $v = $phar['a.csv'];
 
 echo "===6===\n";
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_009.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/phar_oo_009.phpt
diff -u pecl/phar/tests/phar_oo_009.phpt:1.5 
pecl/phar/tests/phar_oo_009.phpt:1.6
--- pecl/phar/tests/phar_oo_009.phpt:1.5        Mon Jan  8 23:03:40 2007
+++ pecl/phar/tests/phar_oo_009.phpt    Sun Jan 21 17:40:26 2007
@@ -13,7 +13,7 @@
 require_once 'phar_oo_test.inc';
 
 $phar = new Phar($fname);
-$phar->setFileClass('SplFileObject');
+$phar->setInfoClass('SplFileObject');
 
 $f = $phar['a.csv'];
 $f->setFlags(SplFileObject::SKIP_EMPTY | SplFileObject::DROP_NEW_LINE);
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_011.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/phar_oo_011.phpt
diff -u pecl/phar/tests/phar_oo_011.phpt:1.4 
pecl/phar/tests/phar_oo_011.phpt:1.5
--- pecl/phar/tests/phar_oo_011.phpt:1.4        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_011.phpt    Sun Jan 21 17:40:26 2007
@@ -14,6 +14,7 @@
 require_once 'phar_oo_test.inc';
 
 $phar = new Phar($fname);
+$phar->setInfoClass('SplFileObject');
 
 $phar['f.php'] = 'hi';
 var_dump(isset($phar['f.php']));
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_012.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/phar_oo_012.phpt
diff -u pecl/phar/tests/phar_oo_012.phpt:1.4 
pecl/phar/tests/phar_oo_012.phpt:1.5
--- pecl/phar/tests/phar_oo_012.phpt:1.4        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_012.phpt    Sun Jan 21 17:40:26 2007
@@ -14,6 +14,7 @@
 require_once 'phar_oo_test.inc';
 
 $phar = new Phar($fname);
+$phar->setInfoClass('SplFileObject');
 
 $phar['f.php'] = 'hi';
 var_dump(isset($phar['f.php']));
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_012_confirm.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/phar_oo_012_confirm.phpt
diff -u pecl/phar/tests/phar_oo_012_confirm.phpt:1.3 
pecl/phar/tests/phar_oo_012_confirm.phpt:1.4
--- pecl/phar/tests/phar_oo_012_confirm.phpt:1.3        Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_012_confirm.phpt    Sun Jan 21 17:40:26 2007
@@ -14,6 +14,7 @@
 require_once 'phar_oo_test.inc';
 
 $phar = new Phar($fname);
+$phar->setInfoClass('SplFileObject');
 
 $phar['f.php'] = 'hi';
 var_dump(isset($phar['f.php']));
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_012b.phpt?r1=1.3&r2=1.4&diff_format=u
Index: pecl/phar/tests/phar_oo_012b.phpt
diff -u pecl/phar/tests/phar_oo_012b.phpt:1.3 
pecl/phar/tests/phar_oo_012b.phpt:1.4
--- pecl/phar/tests/phar_oo_012b.phpt:1.3       Sun Jan 21 15:25:49 2007
+++ pecl/phar/tests/phar_oo_012b.phpt   Sun Jan 21 17:40:26 2007
@@ -16,6 +16,7 @@
        require_once 'phar_oo_test.inc';
        
        $phar = new Phar($fname);
+       $phar->setInfoClass('SplFileObject');
        
        $phar['f.php'] = 'hi';
        var_dump(isset($phar['f.php']));