Przeglądaj źródła

Merge pull request #370 from hason/config_timeout

Added config directive 'process-timeout'
Jordi Boggiano 13 lat temu
rodzic
commit
7ae2a7fb99
1 zmienionych plików z 3 dodań i 3 usunięć
  1. 3 3
      src/Composer/Factory.php

+ 3 - 3
src/Composer/Factory.php

@@ -52,6 +52,7 @@ class Factory
         // Configuration defaults
         $composerConfig = array(
             'vendor-dir' => 'vendor',
+            'process-timeout' => 60,
         );
 
         $packageConfig = $file->read();
@@ -69,9 +70,8 @@ class Factory
         $binDir = getenv('COMPOSER_BIN_DIR') ?: $packageConfig['config']['bin-dir'];
 
         // setup process timeout
-        if (false !== getenv('COMPOSER_PROCESS_TIMEOUT')) {
-            ProcessExecutor::setTimeout((int) getenv('COMPOSER_PROCESS_TIMEOUT'));
-        }
+        $processTimeout = getenv('COMPOSER_PROCESS_TIMEOUT') ?: $packageConfig['config']['process-timeout']
+        ProcessExecutor::setTimeout((int) $processTimeout);
 
         // initialize repository manager
         $rm = $this->createRepositoryManager($io);