Pass build object to SystemCommandException

phpbrew · Dec 5, 2015 · 3848399 · 3848399
1 parent 4990f78
commit 3848399
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/PhpBrew/Exception/SystemCommandException.php b/src/PhpBrew/Exception/SystemCommandException.php
@@ -1,21 +1,30 @@
 <?php
 namespace PhpBrew\Exception;
 use RuntimeException;
+use PhpBrew\Build;
 
 class SystemCommandException extends RuntimeException
 {
     protected $logFile;
 
-    public function __construct($message, $logFile = null)
+    protected $build;
+
+    public function __construct($message, Build $build = null, $logFile = null)
     {
         parent::__construct($message);
+        $this->build = $build;
         $this->logFile = $logFile;
     }
 
     public function getLogFile()
     {
         return $this->logFile;
     }
+
+    public function getBuild()
+    {
+        return $this->build;
+    }
 }
 
 

diff --git a/src/PhpBrew/Tasks/BuildTask.php b/src/PhpBrew/Tasks/BuildTask.php
@@ -44,7 +44,7 @@ public function run(Build $build, $targets = array())
             $startTime = microtime(true);
             $code = $cmd->execute();
             if ($code != 0) {
-                throw new SystemCommandException('Make failed.', $build->getBuildLogPath());
+                throw new SystemCommandException('Make failed.', $build, $build->getBuildLogPath());
             }
             $buildTime = round((microtime(true) - $startTime) / 60, 1);
             $this->info("Build finished: $buildTime minutes.");

diff --git a/src/PhpBrew/Tasks/ConfigureTask.php b/src/PhpBrew/Tasks/ConfigureTask.php
@@ -30,7 +30,7 @@ public function run(Build $build, $variantOptions)
             $this->debug("configure file not found, running './buildconf --force'...");
             $lastline = system('./buildconf --force', $status);
             if ($status !== 0) {
-                throw new SystemCommandException("buildconf error: $lastline");
+                throw new SystemCommandException("buildconf error: $lastline", $build);
             }
         }
         $prefix = $build->getInstallPrefix();
@@ -123,7 +123,7 @@ public function run(Build $build, $variantOptions)
         if (!$this->options->dryrun) {
             $code = $cmd->execute();
             if ($code != 0) {
-                throw new SystemCommandException("Configure failed: $code", $buildLogPath);
+                throw new SystemCommandException("Configure failed: $code", $build, $buildLogPath);
             }
         }
 

diff --git a/src/PhpBrew/Tasks/InstallTask.php b/src/PhpBrew/Tasks/InstallTask.php
@@ -19,7 +19,7 @@ public function install(Build $build)
         if (!$this->options->dryrun) {
             $code = $cmd->execute();
             if ($code != 0) {
-                throw new SystemCommandException('Install failed.', $build->getBuildLogPath());
+                throw new SystemCommandException('Install failed.', $build, $build->getBuildLogPath());
             }
         }
         $build->setState(Build::STATE_INSTALL);