4,18 → 4,11 |
* |
* PHP versions 4 and 5 |
* |
* LICENSE: This source file is subject to version 3.0 of the PHP license |
* that is available through the world-wide-web at the following URI: |
* http://www.php.net/license/3_0.txt. If you did not receive a copy of |
* the PHP License and are unable to obtain it through the web, please |
* send a note to license@php.net so we can mail you a copy immediately. |
* |
* @category pear |
* @package PEAR |
* @author Greg Beaver <cellog@php.net> |
* @copyright 1997-2006 The PHP Group |
* @license http://www.php.net/license/3_0.txt PHP License 3.0 |
* @version CVS: $Id: v2.php,v 1.19 2006/01/23 17:39:52 cellog Exp $ |
* @copyright 1997-2009 The Authors |
* @license http://opensource.org/licenses/bsd-license.php New BSD License |
* @link http://pear.php.net/package/PEAR |
* @since File available since Release 1.4.0a1 |
*/ |
29,8 → 22,8 |
* @category pear |
* @package PEAR |
* @author Greg Beaver <cellog@php.net> |
* @copyright 1997-2006 The PHP Group |
* @license http://www.php.net/license/3_0.txt PHP License 3.0 |
* @copyright 1997-2009 The Authors |
* @license http://opensource.org/licenses/bsd-license.php New BSD License |
* @version Release: @PEAR-VER@ |
* @link http://pear.php.net/package/PEAR |
* @since Class available since Release 1.4.0a1 |
70,6 → 63,8 |
foreach (explode("\n", $str) as $line) { |
if (substr($line, 0, $indent_len) == $indent) { |
$data .= substr($line, $indent_len) . "\n"; |
} else { |
$data .= $line . "\n"; |
} |
} |
return $data; |
97,19 → 92,21 |
* a subclass |
* @return PEAR_PackageFile_v2 |
*/ |
function &parse($data, $file, $archive = false, $class = 'PEAR_PackageFile_v2') |
function parse($data, $file = null, $archive = false, $class = 'PEAR_PackageFile_v2') |
{ |
if (PEAR::isError($err = parent::parse($data, $file))) { |
if (PEAR::isError($err = parent::parse($data))) { |
return $err; |
} |
|
$ret = new $class; |
$ret->encoding = $this->encoding; |
$ret->setConfig($this->_config); |
if (isset($this->_logger)) { |
$ret->setLogger($this->_logger); |
} |
|
$ret->fromArray($this->_unserializedData); |
$ret->setPackagefile($file, $archive); |
return $ret; |
} |
} |
?> |
} |