Changeset 73

Show
Ignore:
Timestamp:
05/23/06 13:11:38 (2 years ago)
Author:
hans
Message:

#41 - Fixing more E_STRICT errors in trunk & 2.2 branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2/classes/phing/system/io/FileSystem.php

    r70 r73  
    5454     * this platform's local filesystem driver. 
    5555     */ 
    56     static function getFileSystem() { 
     56    public static function getFileSystem() { 
    5757        if (self::$fs === null) { 
    5858            switch(Phing::getProperty('host.fstype')) { 

  • branches/2.2/classes/phing/types/selectors/SelectorUtils.php

    r70 r73  
    4444      * Retrieves the instance of the Singleton. 
    4545      */ 
    46     public function getInstance() { 
     46    public static function getInstance() { 
    4747        if (!isset(self::$instance)) { 
    4848            self::$instance = new SelectorUtils(); 
    …… 
    424424     * @return whether the target is out of date 
    425425     */ 
    426     public function isOutOfDate(PhingFile $src, PhingFile $target, $granularity) { 
     426    public static function isOutOfDate(PhingFile $src, PhingFile $target, $granularity) { 
    427427        if (!$src->exists()) { 
    428428            return false; 

  • trunk/classes/phing/parser/ProjectConfigurator.php

    r1 r73  
    107107     * @access public 
    108108     */ 
    109     function configure($target, $attrs, Project $project) {                
     109    public static function configure($target, $attrs, Project $project) {                
    110110 
    111111        if ($target instanceof TaskAdapter) { 
    …… 
    152152     * @access public 
    153153     */ 
    154     function addText($project, $target, $text = null) { 
     154    public static function addText($project, $target, $text = null) { 
    155155        if ($text === null || strlen(trim($text)) === 0) { 
    156156            return; 
    …… 
    170170     * @access public 
    171171     */ 
    172     function storeChild($project, $parent, $child, $tag) { 
     172    public static function storeChild($project, $parent, $child, $tag) { 
    173173        $ih = IntrospectionHelper::getHelper(get_class($parent)); 
    174174        $ih->storeElement($project, $parent, $child, $tag); 

  • trunk/classes/phing/system/io/FileSystem.php

    r1 r73  
    5454     * this platform's local filesystem driver. 
    5555     */ 
    56     function getFileSystem() { 
     56    public static function getFileSystem() { 
    5757        if (self::$fs === null) { 
    5858            switch(Phing::getProperty('host.fstype')) { 

  • trunk/classes/phing/system/lang/Character.php

    r1 r73  
    3030    // anyway just a thought 
    3131 
    32     function isLetter($char) { 
     32    public static function isLetter($char) { 
    3333 
    3434        if (strlen($char) !== 1) 

  • trunk/classes/phing/types/selectors/SelectorUtils.php

    r1 r73  
    4444      * Retrieves the instance of the Singleton. 
    4545      */ 
    46     public function getInstance() { 
     46    public static function getInstance() { 
    4747        if (!isset(self::$instance)) { 
    4848            self::$instance = new SelectorUtils(); 
    …… 
    6969     * pattern up to the first "**". 
    7070     */ 
    71     public function matchPatternStart($pattern, $str, $isCaseSensitive = true) { 
     71    public static function matchPatternStart($pattern, $str, $isCaseSensitive = true) { 
    7272 
    7373        // When str starts with a DIRECTORY_SEPARATOR, pattern has to start with a 
    …… 
    127127     *         or <code>false</code> otherwise. 
    128128     */ 
    129     public function matchPath($pattern, $str, $isCaseSensitive = true) { 
     129    public static function matchPath($pattern, $str, $isCaseSensitive = true) { 
    130130     
    131131        // When str starts with a DIRECTORY_SEPARATOR, pattern has to start with a 
    …… 
    260260     *         or <code>false</code> otherwise. 
    261261     */ 
    262     public function match($pattern, $str, $isCaseSensitive = true) { 
     262    public static function match($pattern, $str, $isCaseSensitive = true) { 
    263263     
    264264        $patArr = StringHelper::toCharArray($pattern); 
    …… 
    424424     * @return whether the target is out of date 
    425425     */ 
    426     public function isOutOfDate(PhingFile $src, PhingFile $target, $granularity) { 
     426    public static function isOutOfDate(PhingFile $src, PhingFile $target, $granularity) { 
    427427        if (!$src->exists()) { 
    428428            return false;