Changeset 07b36d7


Ignore:
Timestamp:
01/30/12 23:16:39 (4 months ago)
Author:
mrook
Branches:
master
Children:
99c2563
Parents:
fe47992
git-author:
Michiel Rook <mrook@…> (01/30/12 23:16:39)
git-committer:
Michiel Rook <mrook@…> (01/30/12 23:16:39)
Message:

Fixes #790 - apply patches to refactor createFileset into addFileset calls

Location:
classes/phing/tasks
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • classes/phing/tasks/ext/PearPackageTask.php

    r4914c34 r07b36d7  
    256256     * Nested creator, creates a FileSet for this task 
    257257     * 
    258      * @return FileSet The created fileset object 
    259      */ 
    260     public function createFileSet() { 
    261         $num = array_push($this->filesets, new FileSet()); 
    262         return $this->filesets[$num-1]; 
     258     * @param FileSet $fileset Set of files to add to the package 
     259     * 
     260     * @return void 
     261     */ 
     262    public function addFileSet(FileSet $fs) { 
     263        $this->filesets[] = $fs; 
    263264    } 
    264265     
  • classes/phing/tasks/ext/phpcpd/PHPCPDTask.php

    re551855 r07b36d7  
    129129     * Nested creator, adds a set of files (nested fileset attribute). 
    130130     * 
    131      * @return FileSet The created fileset object 
    132      */ 
    133     public function createFileSet() 
    134     { 
    135         $num = array_push($this->_filesets, new FileSet()); 
    136         return $this->_filesets[$num-1]; 
     131     * @param FileSet $fs List of files to scan 
     132     * 
     133     * @return void 
     134     */ 
     135    public function addFileSet(FileSet $fs) 
     136    { 
     137        $this->_filesets[] = $fs; 
    137138    } 
    138139 
  • classes/phing/tasks/ext/rSTTask.php

    rc920479 r07b36d7  
    431431 
    432432    /** 
    433      * Nested creator, creates a FileSet for this task 
    434      * 
    435      * @return object The created fileset object 
    436      */ 
    437     public function createFileSet() 
    438     { 
    439         $num = array_push($this->filesets, new FileSet()); 
    440         return $this->filesets[$num-1]; 
     433     * Add a set of files to be rendered. 
     434     * 
     435     * @param FileSet $fileset Set of rst files to render 
     436     * 
     437     * @return void 
     438     */ 
     439    public function addFileset(FileSet $fileset) 
     440    { 
     441        $this->filesets[] = $fileset; 
    441442    } 
    442443 
  • classes/phing/tasks/system/ChownTask.php

    r2baac48 r07b36d7  
    9797     * Nested creator, adds a set of files (nested fileset attribute). 
    9898     */ 
    99     function createFileSet() { 
    100         $num = array_push($this->filesets, new FileSet()); 
    101         return $this->filesets[$num-1]; 
     99    function addFileSet(FileSet $fs) { 
     100        $this->filesets[] = $fs; 
    102101    } 
    103102 
  • classes/phing/tasks/system/CopyTask.php

    r5e93b26 r07b36d7  
    198198     * Nested creator, creates a FileSet for this task 
    199199     * 
    200      * @access  public 
    201      * @return  object  The created fileset object 
    202      */ 
    203     function createFileSet() { 
    204         $num = array_push($this->filesets, new FileSet()); 
    205         return $this->filesets[$num-1]; 
     200     * @param FileSet $fileset Set of files to copy 
     201     * 
     202     * @return void 
     203     */ 
     204    public function addFileSet(FileSet $fs) { 
     205        $this->filesets[] = $fs; 
    206206    } 
    207207 
  • classes/phing/tasks/system/DeleteTask.php

    r237cb3e r07b36d7  
    9797 
    9898    /** Nested creator, adds a set of files (nested fileset attribute). */ 
    99     function createFileSet() { 
    100         $num = array_push($this->filesets, new FileSet()); 
    101         return $this->filesets[$num-1]; 
     99    function addFileSet(FileSet $fs) { 
     100        $this->filesets[] = $fs; 
    102101    } 
    103102     
  • classes/phing/tasks/system/UpToDateTask.php

    r1fe0905 r07b36d7  
    124124     * Nested <fileset> element. 
    125125     */ 
    126     public function createFileset() { 
    127         $fs = new FileSet(); 
     126    public function addFileset(FileSet $fs) { 
    128127        $this->sourceFileSets[] = $fs; 
    129         return $fs; 
    130128    } 
    131129     
Note: See TracChangeset for help on using the changeset viewer.