Changeset ca1d246

Timestamp:

01/25/12 09:31:50 (4 months ago)

Author:

mrook

Branches:

master

Children:

24fb7cd, 7ef3270

Parents:

13fc574 (diff), 2f5dd85 (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@…> (01/25/12 09:31:50)

git-committer:

Michiel Rook <mrook@…> (01/25/12 09:31:50)

Message:

Merge pull request #72 from bd808/feature-allow-phpunit-testsuites

Allow PHPUnit_Framework_TestSuite subclasses.

Location:

classes/phing/tasks/ext

Files:

• phpunit/BatchTest.php (modified) (2 diffs)
• coverage/CoverageReportTask.php (modified) (1 diff)
• coverage/CoverageReportTransformer.php (modified) (1 diff)
• phk/PhkPackageTask.php (modified) (1 diff)
• phpunit/PHPUnitReportTask.php (modified) (1 diff)

classes/phing/tasks/ext/phpunit/BatchTest.php

@@ -200 +200 @@
         foreach ($this->elements() as $test)
         {
-            $testClass = new ReflectionClass($test);
+            $testClass = new $test();
+            if (!($testClass instanceof PHPUnit_Framework_TestSuite))
+            {
+              $testClass = new ReflectionClass($test);
+            }
             
             $suite->addTestSuite($testClass);
@@ -215 +219 @@
     {
         foreach ($this->elements() as $element) {
-            $suite->addTestSuite(new ReflectionClass($element));
+            $testClass = new $element();
+            if (!($testClass instanceof PHPUnit_Framework_TestSuite))
+            {
+                $testClass = new ReflectionClass($element);
+            }
+            $suite->addTestSuite($testClass);
         }
     }

classes/phing/tasks/ext/coverage/CoverageReportTask.php

@@ -239 +239 @@
             $html = $geshi->parse_code();
 
-            $lines = split("<li>|</li>", $html);
+            $lines = preg_split("#</?li>#", $html);
 
             // skip first and last line

classes/phing/tasks/ext/coverage/CoverageReportTransformer.php

@@ -108 +108 @@
 
         $proc = new XSLTProcessor();
-        if (version_compare(PHP_VERSION,'5.4',"<"))
+        if (defined('XSL_SECPREF_WRITE_FILE'))
         {
-            ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
-        }
-        else
-        {
-            $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+            if (version_compare(PHP_VERSION,'5.4',"<"))
+            {
+                ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+            }
+            else
+            {
+                $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+            }
         }
         

classes/phing/tasks/ext/phk/PhkPackageTask.php

@@ -225 +225 @@
          */
         $output = trim(ob_get_clean());
-        $output = split("\n", $output);
+        $output = explode("\n", $output);
         foreach ($output as $line) {
             /*

classes/phing/tasks/ext/phpunit/PHPUnitReportTask.php

@@ -150 +150 @@
 
         $proc = new XSLTProcessor();
-        if (version_compare(PHP_VERSION,'5.4',"<"))
-        {
-            ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
-        }
-        else
-        {
-            $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+        if (defined('XSL_SECPREF_WRITE_FILE'))
+        {
+            if (version_compare(PHP_VERSION,'5.4',"<"))
+            {
+                ini_set("xsl.security_prefs", XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+            }
+            else
+            {
+                $proc->setSecurityPrefs(XSL_SECPREF_WRITE_FILE | XSL_SECPREF_CREATE_DIRECTORY);
+            }
         }