diff options
Diffstat (limited to 'buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php')
| -rwxr-xr-x[-rw-r--r--] | buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php b/buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php index 12bd4e55..23a0e4c6 100644..100755 --- a/buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php +++ b/buildscripts/phing/classes/phing/tasks/ext/pearpackage/Fileset.php @@ -1,6 +1,6 @@ <?php /* - * $Id: Fileset.php 59 2006-04-28 14:49:47Z mrook $ + * $Id: 7016dea93483cc99ad17a638e30f5ff57c37c78b $ * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -30,17 +30,11 @@ include_once 'phing/system/io/PhingFile.php'; * @author Greg Beaver * @author Hans Lellelid <hans@xmpl.org> * @package phing.tasks.ext.pearpackage - * @version $Revision: 1.7 $ + * @version $Id$ */ class PEAR_PackageFileManager_Fileset { /** - * @access private - * @var PEAR_PackageFileManager - */ - private $parent; - - /** * Curent Phing Project. * @var Project */ @@ -60,9 +54,12 @@ class PEAR_PackageFileManager_Fileset { * @param PEAR_PackageFileManager * @param array */ - function __construct($parent, $options) + function __construct($options) { - $this->parent = $parent; + if (!is_array($options)) { + $options = $options->getOptions(); + } + $this->project = $options['phing_project']; $this->filesets = $options['phing_filesets']; } @@ -109,7 +106,7 @@ class PEAR_PackageFileManager_Fileset { $path = '/'; // for array index } - $parts = explode('.', basename($file)); + $parts = explode('.', basename($file)); $ext = array_pop($parts); if (strlen($ext) == strlen($file)) { $ext = ''; @@ -228,4 +225,4 @@ class PEAR_PackageFileManager_Fileset { return strnatcasecmp($a,$b); } } -?> + |