Upgrade code - step 1

thirdparty/phing/Phing.php

@@ -817,7 +817,7 @@ class Phing {
         $classFile = strtr($dotClassname, '.', DIRECTORY_SEPARATOR) . ".php";
         $path = substr_replace($dotPath, $classFile, $dotClassnamePos);
         
-        Phing::__import($path, $classpath);
+        Phing::importPhing($path, $classpath);
         
         return $classname;
    }
@@ -828,7 +828,7 @@ class Phing {
     * @param mixed $classpath String or object supporting __toString()
     * @throws BuildException - if cannot find the specified file
     */
-   public static function __import($path, $classpath = null) {
+   public static function importPhing($path, $classpath = null) {
         
         if ($classpath) {
         

thirdparty/phing/tasks/ext/coverage/CoverageSetupTask.php

@@ -150,7 +150,7 @@ class CoverageSetupTask extends TaskPhing
 			
 			xdebug_start_code_coverage(XDEBUG_CC_UNUSED);
 			
-			Phing::__import($fullname, $this->classpath);
+			Phing::importPhing($fullname, $this->classpath);
 			
 			$coverage = xdebug_get_code_coverage();
 			

thirdparty/phing/tasks/ext/phpunit2/PHPUnit2Util.php

@@ -92,7 +92,7 @@ class PHPUnit2Util
 			return self::$definedClasses[$filename];
 		}
 		
-		Phing::__import($filename, $classpath);
+		Phing::importPhing($filename, $classpath);
 
 		$declaredClasses = get_declared_classes();
 		

thirdparty/phing/tasks/system/CvsTask.php

@@ -254,7 +254,7 @@ class CvsTask extends TaskPhing {
         $c = $this->getCommand();
         $cloned = null;
         if ($c !== null) {
-            $cloned = $this->cmd->__copy();
+            $cloned = $this->cmd->copyPhing();
             $cloned->createArgument(true)->setLine($c);
             $this->addConfiguredCommandline($cloned, true);
         }

thirdparty/phing/types/Commandline.php

@@ -270,7 +270,7 @@ class Commandline {
         return count($this->getCommandline());
     }
 
-    public function __copy() {
+    public function copyPhing() {
         $c = new Commandline();
         $c->setExecutable($this->executable);
         $c->addArguments($this->getArguments());