Moving a pice of code to a better home

cakephp · Jun 17, 2014 · d624cbb · d624cbb
1 parent 583e918
commit d624cbb
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 35 deletions.
diff --git a/src/Console/Command/Task/BakeTask.php b/src/Console/Command/Task/BakeTask.php
@@ -101,6 +101,46 @@ public function main() {
 		}
 	}
 
+/**
+ * Executes an external shell command and pipes its output to the stdout
+ *
+ * @param string $command the command to execute
+ * @return void
+ * @throws \RuntimeExeception if any errors occurred during the execution
+ */
+	public function callProcess($command) {
+		$descriptorSpec = [
+			0 => ['pipe', 'r'],
+			1 => ['pipe', 'w'],
+			2 => ['pipe', 'w']
+		];
+		$this->_io->verbose('Running ' . $command);
+		$process = proc_open(
+			$command,
+			$descriptorSpec,
+			$pipes
+		);
+		if (!is_resource($process)) {
+			$this->error(__d('cake_console', 'Could not start subprocess.'));
+			return false;
+		}
+		$output = $error = '';
+		fclose($pipes[0]);
+
+		$output = stream_get_contents($pipes[1]);
+		fclose($pipes[1]);
+
+		$error = stream_get_contents($pipes[2]);
+		fclose($pipes[2]);
+		proc_close($process);
+
+		if ($error) {
+			throw new \RuntimeException($error);
+		}
+
+		$this->out($output);
+	}
+
 /**
  * Handles splitting up the plugin prefix and classname.
  *

diff --git a/src/Console/Command/Task/PluginTask.php b/src/Console/Command/Task/PluginTask.php
@@ -249,7 +249,7 @@ protected function _modifyAutoloader($plugin, $path) {
 		try {
 			$command = 'cd ' . escapeshellarg($path) . '; ';
 			$command .= 'php ' . escapeshellarg($composer) . ' dump-autoload ';
-			$this->Project->callComposer($command);
+			$this->callProcess($command);
 		} catch (\RuntimeException $e) {
 			$error = $e->getMessage();
 			$this->error(__d('cake_console', 'Could not run `composer dump-autoload`: %s', $error));

diff --git a/src/Console/Command/Task/ProjectTask.php b/src/Console/Command/Task/ProjectTask.php
@@ -147,7 +147,7 @@ public function bake($path) {
 		$command = 'php ' . escapeshellarg($composer) . ' create-project -s dev cakephp/app ' . escapeshellarg($path);
 
 		try {
-			$this->callComposer($command);
+			$this->callProcess($command);
 		} catch (\RuntimeException $e) {
 			$error = $e->getMessage();
 			$this->error(__d('cake_console', 'Installation from packagist.org failed with: %s', $error));
@@ -157,39 +157,6 @@ public function bake($path) {
 		return true;
 	}
 
-	public function callComposer($command) {
-		$descriptorSpec = [
-			0 => ['pipe', 'r'],
-			1 => ['pipe', 'w'],
-			2 => ['pipe', 'w']
-		];
-		$this->_io->verbose('Running ' . $command);
-		$process = proc_open(
-			$command,
-			$descriptorSpec,
-			$pipes
-		);
-		if (!is_resource($process)) {
-			$this->error(__d('cake_console', 'Could not start subprocess.'));
-			return false;
-		}
-		$output = $error = '';
-		fclose($pipes[0]);
-
-		$output = stream_get_contents($pipes[1]);
-		fclose($pipes[1]);
-
-		$error = stream_get_contents($pipes[2]);
-		fclose($pipes[2]);
-		proc_close($process);
-
-		if ($error) {
-			throw new \RuntimeException($error);
-		}
-
-		$this->out($output);
-	}
-
 /**
  * get the option parser.
  *