Ticket #461: r773t461.patch

classes/phing/Phing.php

@@ -536 +536 @@
             $this->targets[] = $project->getDefaultTarget();
         }
 
+        // make sure that minimum required phing version is satisfied
+        try {
+            $this->comparePhingVersion($project->getPhingVersion()); 
+        } catch(Exception $exc) {
+            $project->fireBuildFinished($exc);
+            restore_error_handler();
+            self::unsetCurrentProject();
+            throw $exc;
+        }
+
         // execute targets if help param was not given
         if (!$this->projectHelp) {
 
@@ -570 +580 @@
         self::unsetCurrentProject();
     }
 
+    private function comparePhingVersion($version) {
+        $current = strtolower(self::getPhingVersion());
+        $current = trim(str_replace('phing', '', $current)); 
+
+        // make sure that version checks are not applied to trunk
+        if('dev' === $current) {
+            return 1;
+        }
+
+        if(-1 == version_compare($current, $version)) {
+            throw new BuildException(
+                sprintf('Incompatible Phing version (%s). Version "%s" required.', $current, $version));
+        }
+    }
+
     /**
      * Bind any registered build listeners to this project.
      *

classes/phing/Project.php

@@ -98 +98 @@
     /** project description */
     private $description;
 
+    /** require phing version */
+    private $phingVersion;
+
     /** a FileUtils object */
     private $fileUtils;
     
@@ -440 +443 @@
         return $this->description;
     }
 
+    /** Set the minimum required phing version **/
+    function setPhingVersion($version) {
+        $version = str_replace('phing', '', strtolower($version));
+        $this->phingVersion = (string)trim($version);
+    }
+
+    /** Get the minimum required phing version **/
+    function getPhingVersion() {
+        if($this->phingVersion === null) {
+            $this->setPhingVersion(Phing::getPhingVersion());
+        }
+        return $this->phingVersion;
+    }
+
     /** Set basedir object from xml*/
     function setBasedir($dir) {
         if ($dir instanceof PhingFile) {

classes/phing/parser/ProjectHandler.php

@@ -69 +69 @@
         $id    = null;
         $desc = null;
         $baseDir = null;
+        $ver = null;
 
         // some shorthands
         $project = $this->configurator->project;
@@ -85 +86 @@
                 $baseDir = $value;
             } elseif ($key === "description") {
                 $desc = $value;
+            } elseif ($key === "phingVersion") {
+                $ver = $value;
             } else {
                 throw new ExpatParseException("Unexpected attribute '$key'");
             }
@@ -118 +121 @@
             $project->setDescription($desc);
           }        
 
+          if($ver !== null) {
+              $project->setPhingVersion($ver);
+          }
+
           if ($project->getProperty("project.basedir") !== null) {
             $project->setBasedir($project->getProperty("project.basedir"));
           } else {