Merge branch 'soren121-composer-2.3-fix' into 1.2

fxpio · Apr 17, 2022 · a5f6ddc · a5f6ddc
2 parents dc2759e + 9688a93
commit a5f6ddc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Asset/AbstractAssetManager.php b/Asset/AbstractAssetManager.php
@@ -218,7 +218,7 @@ public function run()
         $this->io->write($info);
 
         $timeout = ProcessExecutor::getTimeout();
-        ProcessExecutor::setTimeout($this->config->get('manager-timeout'));
+        ProcessExecutor::setTimeout($this->config->get('manager-timeout', PHP_INT_MAX));
         $cmd = $updatable ? $this->getUpdateCommand() : $this->getInstallCommand();
         $res = (int) $this->executor->execute($cmd);
         ProcessExecutor::setTimeout($timeout);

diff --git a/Resources/doc/config.md b/Resources/doc/config.md
@@ -241,7 +241,7 @@ option `config.foxy.manager-update-options` [`string`, default: `null`].
 ### Define the execution timeout of the asset manager
 
 You can define the execution timeout of the asset manager with the
-option `config.foxy.manager-timeout` [`int`, default: `null`].
+option `config.foxy.manager-timeout` [`int`, default: `PHP_INT_MAX`].
 
 **Example:**
 ```json