cvs: pear /File_Archive Archive.php /File_Archive/tests test.php
| From: | Vincent Lascaux | Date: | Wed, 18 May 2005 09:44:47 +0000 |
| Subject: | cvs: pear /File_Archive Archive.php /File_Archive/tests test.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-31903@lists.php.net to get a copy of this message | ||
vincentlascaux Wed May 18 05:44:47 2005 EDT
Modified files:
/pear/File_Archive Archive.php
/pear/File_Archive/tests test.php
Log:
Better error handling in readMulti
http://cvs.php.net/diff.php/pear/File_Archive/Archive.php?r1=1.39&r2=1.40&ty=u
Index: pear/File_Archive/Archive.php
diff -u pear/File_Archive/Archive.php:1.39 pear/File_Archive/Archive.php:1.40
--- pear/File_Archive/Archive.php:1.39 Sat May 14 20:13:19 2005
+++ pear/File_Archive/Archive.php Wed May 18 05:44:45 2005
@@ -27,7 +27,7 @@
* @author Vincent Lascaux <vincentlascaux@php.net>
* @copyright 1997-2005 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version CVS: $Id: Archive.php,v 1.39 2005/05/15 00:13:19 vincentlascaux Exp $
+ * @version CVS: $Id: Archive.php,v 1.40 2005/05/18 09:44:45 vincentlascaux Exp $
* @link http://pear.php.net/package/File_Archive
*/
@@ -448,7 +448,9 @@
require_once "File/Archive/Reader/Multi.php";
$result = new File_Archive_Reader_Multi();
foreach ($sources as $index => $foo) {
- if (is_string($sources[$index])) {
+ if (PEAR::isError($sources[$index])) {
+ return $sources[$index];
+ } else if (is_string($sources[$index])) {
unset($URLreader);
$URLreader = File_Archive::read($sources[$index]);
if (PEAR::isError($URLreader)) {
http://cvs.php.net/diff.php/pear/File_Archive/tests/test.php?r1=1.29&r2=1.30&ty=u
Index: pear/File_Archive/tests/test.php
diff -u pear/File_Archive/tests/test.php:1.29 pear/File_Archive/tests/test.php:1.30
--- pear/File_Archive/tests/test.php:1.29 Sat May 14 20:13:20 2005
+++ pear/File_Archive/tests/test.php Wed May 18 05:44:47 2005
@@ -15,6 +15,7 @@
{
$reader = File_Archive::readMemory("ABCDEFGH", "Memory");
+ $this->assertFalse(PEAR::isError($reader));
$this->assertTrue($reader->next());
$this->assertEquals("Memory", $reader->getFilename());
$this->assertEquals("A", $reader->getData(1));
@@ -27,6 +28,7 @@
{
$reader = File_Archive::read("test.php", "test.php");
+ $this->assertFalse(PEAR::isError($reader));
$this->assertTrue($reader->next());
$this->assertEquals(file_get_contents("test.php"), $reader->getData());
$this->assertFalse($reader->next());
@@ -36,30 +38,13 @@
{
$reader = File_Archive::read("http://www.google.com", "google.html");
+ $this->assertFalse(PEAR::isError($reader));
$this->assertTrue($reader->next());
$data = $reader->getData();
$this->assertFalse(empty($data));
$reader->close();
}
- function _testAdvancedURLReader()
- {
- $reader = File_Archive::read("http://poocl.la-grotte.org/downloads/PEAR2/poocl.tar/");
- $nbFiles = '';
- while ($reader->next())
- {
- $nbFiles++;
- }
- $this->assertEquals(39, $nbFiles);
- $reader->close();
- }
- function _testDownloadAdvancedURL()
- {
- $reader = File_Archive::read("http://poocl.la-grotte.org/downloads/PEAR2/poocl.tar/File/Archive.php");
- $this->assertTrue($reader->next());
- $data = $reader->getData();
- $reader->close();
- }
function testMultiReader()
{
$reader = File_Archive::readMulti();
@@ -287,10 +272,14 @@
}
function testDirectories()
{
- File_Archive::extract(
- File_Archive::read('../Archive'),
+ $error = File_Archive::extract(
+ File_Archive::read('../Archve'),
File_Archive::toArchive('up.tbz', File_Archive::toFiles())
);
+ if (PEAR::isError($error)) {
+ var_dump($error);
+ }
+ $this->assertFalse(PEAR::isError($error));
$source = File_Archive::read('up.tbz/');
$appendedData = File_Archive::read('test.php');