Changeset 2eb9b25

Timestamp:

01/20/12 22:26:38 (4 months ago)

Author:

Bryan Davis <bpd@…>

Branches:

master

Children:

4870cff

Parents:

f3e60a4

git-author:

Bryan Davis <bpd@…> (01/20/12 22:26:38)

git-committer:

Bryan Davis <bpd@…> (01/20/12 22:26:38)

Message:

Guard against undefined XSL_SECPREF_WRITE_FILE.

Related to #800 at phing.info. Usage of constant XSL_SECPREF_WRITE_FILE
in older versions of php produces an undefined constant warning.
Depending on php runtime configuration this can lead to a fatal error as
some php environments will install a error to exception routine.

Location:

classes/phing/tasks/ext

Files:

• coverage/CoverageReportTransformer.php (modified) (1 diff)
• phpunit/PHPUnitReportTask.php (modified) (1 diff)

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/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);
+            }
         }