Changeset 1381a1b

Timestamp:

02/01/12 10:33:30 (4 months ago)

Author:

mrook

Branches:

master

Children:

b01f01c, 4238fbf

Parents:

266793b (diff), 150847b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michiel Rook <mrook@…> (02/01/12 10:33:30)

git-committer:

Michiel Rook <mrook@…> (02/01/12 10:33:30)

Message:

Merge pull request #80 from bd808/feature-remove-close-tags

Feature remove close tags

Files:

• .gitignore (modified) (1 diff)
• classes/phing/tasks/ext/ExportPropertiesTask.php (modified) (1 diff)
• classes/phing/tasks/ext/FtpDeployTask.php (modified) (1 diff)
• classes/phing/tasks/ext/ScpTask.php (modified) (1 diff)
• classes/phing/tasks/ext/SshTask.php (modified) (1 diff)
• classes/phing/tasks/ext/jsmin/JsMin.php (modified) (1 diff)
• classes/phing/tasks/ext/jsmin/JsMinTask.php (modified) (1 diff)
• classes/phing/tasks/ext/rSTTask.php (modified) (1 diff)
• classes/phing/tasks/ext/simpletest/SimpleTestDebugResultFormatter.php (modified) (1 diff)
• classes/phing/types/PearPackageFileSet.php (modified) (1 diff)
• classes/phing/util/PearPackageScanner.php (modified) (1 diff)
• classes/phing/tasks/ext/docblox/DocBloxTask.php (modified) (1 diff)

.gitignore

@@ -2 +2 @@
 .project
 .settings
+build/full
+build/pear
 test/reports

classes/phing/tasks/ext/ExportPropertiesTask.php

@@ -140 +140 @@
     }
 }
-
-?>

classes/phing/tasks/ext/FtpDeployTask.php

@@ -232 +232 @@
     }
 }
-?>

classes/phing/tasks/ext/ScpTask.php

@@ -379 +379 @@
     }
 }
-?>

classes/phing/tasks/ext/SshTask.php

@@ -223 +223 @@
     }
 }
-?>

classes/phing/tasks/ext/jsmin/JsMin.php

@@ -291 +291 @@
  */
 class JSMinException extends Exception {}
-?>

classes/phing/tasks/ext/jsmin/JsMinTask.php

@@ -144 +144 @@
     }
 }
-?>

classes/phing/tasks/ext/rSTTask.php

@@ -475 +475 @@
     }
 }
-?>

classes/phing/tasks/ext/simpletest/SimpleTestDebugResultFormatter.php

@@ -118 +118 @@
 
 }
-?>

classes/phing/types/PearPackageFileSet.php

@@ -178 +178 @@
     }
 }
-
-?>

classes/phing/util/PearPackageScanner.php

@@ -169 +169 @@
 
 }
-
-?>

classes/phing/tasks/ext/docblox/DocBloxTask.php

@@ -147 +147 @@
     {
         $parser = new DocBlox_Parser();
-        DocBlox_Parser_Abstract::$event_dispatcher = new sfEventDispatcher();
+        
+        //Only initialize the dispatcher when not already done
+        if (is_null(DocBlox_Parser_Abstract::$event_dispatcher)) {
+                DocBlox_Parser_Abstract::$event_dispatcher = new sfEventDispatcher();
+        }
         $parser->setTitle($this->title);