Changeset 114

Timestamp:

09/12/06 09:05:05 (2 years ago)

Author:

mrook

Message:

Merge 2.2 branch up to & including r29

Files:

• trunk/CHANGELOG (modified) (6 diffs)
• trunk/classes/phing/IntrospectionHelper.php (modified) (1 diff)
• trunk/classes/phing/tasks/ext/PhpLintTask.php (modified) (3 diffs)
• trunk/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html (modified) (1 diff)

trunk/CHANGELOG

@@ -1 +1 @@
-                           _________________________
-                           P     H     I     N     G
+
+
+Feb. ??, 2006 - Phing 2.2.0
+
+  * Removed some lingering E_STRICT errors, bugs with 5.1.x and PHP >= 5.0.5 (HL)
+
+  * Refactored parser to support many tags as children of base <project> tag (HL)
+
+  * Added new IfTask (HL)
+
+  * Added "spawn" attribute to ExecTask (only applies to *nix)
+
+  * Several bugfixes & behavior imporvements to ExecTask (HL, MR, Ben Gollmer)
+
+  * Bugfixes & refactoring for SVNLastRevisionTask (MR, Knut Urdalen)
+
+  * Fixed reference copy bug (HL, Matthias Pigulla)
+
+  * Added SvnExportTask (MR)
+
+  * Added support for FileList in DeleteTask. (HL)
+
+  * Added support for using setting Properties using CDATA value of <property> tag. (HL)
+
+  * Added ReferenceExistsCondition (Matthias Pigulla)
+
+  * Added Phing::log() static method & integrated PHP error handling with Phing logging (HL)
+
+  * Added new task to run the ionCube Encoder (MR)
+
+  * Added new HTML Tidy filter (HL)
+
+  * Added PhpLintTask (Knut Urdalen)
+  
+  * Removed CoverageFormatter class (MR)
+    NOTE: This changes the usage of the collection of PHPUnit2 code coverage reports, see the
+    updated documentation for the CoverageSetupTask
+  
-
-Sept. 18, 2005 - Phing 2.1.1
-
-  * Added support for specifying 4-char mask (e.g. 1777) to ChmodTask. (Hans Lellelid)
-
+
-  * Added .svn files to default excludes in DirectoryScanner.
-
+
-  * Updated PHPUnit2 BatchTest to use class detection and non-dot-path loader. (Michiel Rook)
-
+
-  * Added support for importing non dot-path files (Michiel Rook)
-
+
-  * Add better error message when build fails with exception (Hans Lellelid)
-
+
-  * Fixed runtime error when errors were encountered in AppendTask (Hans Lellelid)
-
-
+
-June 17, 2005 - Phing 2.1.0
-
@@ -34 +72 @@
-
-  * New IncludePathTask (<includepath/>) for adding values to PHP's include_path. (Hans Lellelid)
-
+
-  * Fix to Phing::import() to *not* attempt to invoke __autoload() in class_exists() check. (Hans Lellelid)
-
@@ -52 +90 @@
-    20  Phpunit2report missing XSL stylesheets
-    21  Warnings when output dir does not exist in PHPUnit2Report
-
+
-Oct 16, 2004 - Phing 2.0.0
-  * Minor fixes to make Phing run under E_STRICT/PHP5.
@@ -63 +101 @@
-  * Fixed runtime errors and incomplete inheriting of properties in PhingTask
-  * Added <fileset> support to AppendTask
-
+
-March 19, 2004 - Phing 2.0.0b2
-
+
-  * Brought up-to-date w/ PHP5.0.0RC1 (Hans)
-  * Fixed bug in seting XSLT params using XSLTask (Hans, Jeff Moss)
-  * Fixed PHPUnit test framework for PHPUnit-2.0.0alpha3
- 
+
-  buildfile. (Hans)
- 
+
-  the results of function/method calls. (Hans)
-  * Added new phing.listener.PearLogger listener (logger).  Also, the -logfile arg is now
-  supported. (Hans)
-  * Fixed broken ForeachTask task.  (Manuel)
-
+
-Dec 24, 2003 - Phing 2.0.0b1
-
@@ -89 +127 @@
-  * Corrected non-fatal bugs in: DeleteTask, ReflexiveTask
-  * All core Phing classes now in PHP5 syntax (no "var" used, etc.)
- 
+
-  continue to next file).
- 
+
-  selectors.
-  * Removed redundant calls in DirectoryScanner (<fileset> scanning now much faster).
-  * Fixed fatal errors in File::equals()
-
+
-Nov 24, 2003 - Phing 2.0.0a2
-
-  * Fixed ReplaceTokens filter to correctly replace matched tokens
-  
+
-  * Made IntrospectionHelper more tollerant of add*() and addConfigured*() signatures
-  * New CvsTask and CvsPassTask for working with CVS repositories
@@ -107 +145 @@
-  * Fixed bug in CopyFile/fileset that caused termination of copy operation on encounter
-  of unreadable file
-
+
-Nov 6, 20003 - Phing 2.0.0a1
-

trunk/classes/phing/IntrospectionHelper.php

@@ -195 +195 @@
-                                
-                    preg_match('/@return[\s]+([\w]+)/', $method->getDocComment(), $matches);
-
+, false
-                        $this->nestedTypes[$name] = $matches[1];
-                    } else {                    

trunk/classes/phing/tasks/ext/PhpLintTask.php

@@ -35 +35 @@
-   */
-  public function main() {
+    if(!isset($this->file) and count($this->filesets) == 0) {
+      throw new BuildException("Missing either a nested fileset or attribute 'file' set");
+    }
+
-    if($this->file instanceof PhingFile) {
-      $this->lint($this->file->getPath());
@@ -42 +46 @@
-        $ds = $fs->getDirectoryScanner($project);
-        $files = $ds->getIncludedFiles();
+        $dir = $fs->getDir($this->project)->getPath();
-        foreach($files as $file) {
-
+dir.DIRECTORY_SEPARATOR.$
-        }
-      }
-    }
-    $this->log('No syntax errors detected');
-  }
-
@@ -63 +67 @@
-        exec($command.$file, $message);
-        if(!preg_match('/^No syntax errors detected/', $message[0])) {
-
+
+
+
-        }
-      } else {

trunk/docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html

@@ -152 +152 @@
-  </fileset>
-</coverage-setup>
-
-
+
-  <batchtest>
-    <fileset dir="src">