Changeset 58

Show
Ignore:
Timestamp:
04/28/06 14:41:04 (2 years ago)
Author:
mrook
Message:

Merge r7:r9 from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2/classes/phing/tasks/defaults.properties

    r21 r58  
    3333taskdef=phing.tasks.system.TaskdefTask 
    3434touch=phing.tasks.system.TouchTask 
     35tstamp=phing.tasks.system.TstampTask 
    3536typedef=phing.tasks.system.TypedefTask 
    3637uptodate=phing.tasks.system.UpToDateTask 
    …… 
    6263ioncubeencoder=phing.tasks.ext.ioncube.IoncubeEncoderTask 
    6364ioncubelicense=phing.tasks.ext.ioncube.IoncubeLicenseTask 
     65simpletest=phing.tasks.ext.simpletest.SimpleTestTask 

  • branches/2.2/classes/phing/tasks/ext/phpunit2/FormatterElement.php

    r1 r58  
    3434class FormatterElement 
    3535{ 
    36         private $formatter = NULL; 
     36        protected $formatter = NULL; 
    3737         
    38         private $type = ""; 
     38        protected $type = ""; 
    3939         
    40         private $useFile = true; 
     40        protected $useFile = true; 
    4141         
    42         private $toDir = "."; 
     42        protected $toDir = "."; 
    4343         
    44         private $outfile = ""; 
     44        protected $outfile = ""; 
    4545 
    4646        function setType($type)