Update Task.php

phingofficial · Dec 29, 2017 · e281322 · e281322
1 parent 16be52e
commit e281322
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/classes/phing/Task.php b/classes/phing/Task.php
@@ -221,23 +221,35 @@ public function maybeConfigure()
     /**
      * Perfrom this task
      *
+     * @return void
+     * 
      * @throws BuildException
+     * @throws Error
      */
-    public function perform()
+    public function perform(): void
     {
+        $reason = null;
         try { // try executing task
             $this->project->fireTaskStarted($this);
             $this->maybeConfigure();
             DispatchUtils::main($this);
-            $this->project->fireTaskFinished($this, $null = null);
-        } catch (Exception $exc) {
-            if ($exc instanceof BuildException) {
-                if ($this->getLocation() !== null) {
-                    $exc->setLocation($this->getLocation());
-                }
+        } catch (\BuildException $ex) {
+            $loc = $ex->getLocation();
+            if ($loc === null || (string) $loc === '') {
+                $ex->setLocation($this->getLocation());
             }
-            $this->project->fireTaskFinished($this, $exc);
-            throw $exc;
+            $reason = $ex;
+            throw $ex;
+        } catch (\Exception $ex) {
+            $reason = $ex;
+            $be = new \BuildException($ex);
+            $be->setLocation($this->getLocation());
+            throw $be;
+        } catch (\Error $ex) {
+            $reason = $ex;
+            throw $ex;
+        } finally {
+            $this->project->fireTaskFinished($this, $reason);
         }
     }
 }
diff --git a/test/classes/phing/tasks/TaskdefTaskTest.php b/test/classes/phing/tasks/TaskdefTaskTest.php
@@ -48,12 +48,16 @@ public function testNoClassname()
     }
 
     /**
-     * @expectedException \PHPUnit\Framework\Error\Error
+     * @expectedException BuildException
      */
     public function testClassNotFound()
     {
         try {
-            $this->expectBuildException("classNotFound", "classname specified doesn't exist");
+            $this->executeTarget("classNotFound");
+            $this->fail(
+                "Should throw ConfigurationException because: " .
+                "classname specified doesn't exist"
+            );
         } catch (ConfigurationException $e) {
             //ignored
         }

diff --git a/test/classes/phing/tasks/TypedefTaskTest.php b/test/classes/phing/tasks/TypedefTaskTest.php
@@ -50,7 +50,7 @@ public function testNoClassname()
     }
 
     /**
-     * @expectedException \PHPUnit\Framework\Error\Error
+     * @expectedException BuildException
      */
     public function testClassNotFound()
     {