Merge pull request #28 from articstudio/develop

Fix process timeout

Author: marcmascort

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.0.7] - 2019-02-22
+
+### Fixed
+
+- Fix process timeout
+
 ## [1.0.6] - 2019-02-07
 
 ### Fixed
@@ -46,6 +52,7 @@ All notable changes to this project will be documented in this file.
 - PHP
 
 
+[1.0.7]: https://github.com/articstudio/php-bin/releases/tag/1.0.7
 [1.0.6]: https://github.com/articstudio/php-bin/releases/tag/1.0.6
 [1.0.5]: https://github.com/articstudio/php-bin/releases/tag/1.0.5
 [1.0.4]: https://github.com/articstudio/php-bin/releases/tag/1.0.4

src/Commands/Composer/Install.php

@@ -85,7 +85,7 @@ private function requireDevPackage($version, $input_package_name)
         if (! $version) {
             try {
                 $command = 'composer require --dev ' . $input_package_name;
-                list($exit_code, $output, $exit_code_txt, $error) = $this->callShell($command, false);
+                list($exit_code, $output, $exit_code_txt, $error) = $this->callShell($command, false, 240);
                 if ($exit_code === 1) {
                     throw new PhpBinException("Error installing package: " . $input_package_name . " " . $error);
                 }

src/Concerns/HasShell.php

@@ -12,14 +12,17 @@ trait HasShell
      * Call shell command
      *
      * @param string $cmd
+     * @param bool $throw
+     * @param int $timeout
      * @return array
      * @throws ProcessFailedException
      */
-    protected function callShell(string $cmd, bool $throw = true): array
+    protected function callShell(string $cmd, bool $throw = true, $timeout = 60): array
     {
         $composer = Application::getInstance()->getComposer();
         $cmd = "cd {$composer['directory']} && " . $cmd;
         $process = new Process($cmd);
+        $process->setTimeout($timeout);
         $process->run();
         //while ($process->isRunning()) {
         // TODO: Show loading spinner