mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-02-12 12:39:35 +00:00
Merge remote changes with PR feedback
Combined jbtronics' debug mode handling for composer install with our yarn install/build steps and BackupManager refactoring.
This commit is contained in:
commit
f369e14f2f
2 changed files with 20 additions and 7 deletions
|
|
@ -11,6 +11,7 @@
|
||||||
"ext-intl": "*",
|
"ext-intl": "*",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-mbstring": "*",
|
"ext-mbstring": "*",
|
||||||
|
"ext-zip": "*",
|
||||||
"amphp/http-client": "^5.1",
|
"amphp/http-client": "^5.1",
|
||||||
"api-platform/doctrine-orm": "^4.1",
|
"api-platform/doctrine-orm": "^4.1",
|
||||||
"api-platform/json-api": "^4.0.0",
|
"api-platform/json-api": "^4.0.0",
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ class UpdateExecutor
|
||||||
private readonly InstallationTypeDetector $installationTypeDetector,
|
private readonly InstallationTypeDetector $installationTypeDetector,
|
||||||
private readonly VersionManagerInterface $versionManager,
|
private readonly VersionManagerInterface $versionManager,
|
||||||
private readonly BackupManager $backupManager,
|
private readonly BackupManager $backupManager,
|
||||||
|
#[Autowire(param: 'app.debug_mode')]
|
||||||
|
private readonly bool $debugMode = false,
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -368,13 +370,23 @@ class UpdateExecutor
|
||||||
|
|
||||||
// Step 7: Install PHP dependencies
|
// Step 7: Install PHP dependencies
|
||||||
$stepStart = microtime(true);
|
$stepStart = microtime(true);
|
||||||
$this->runCommand([
|
if ($this->debugMode) {
|
||||||
'composer', 'install',
|
$this->runCommand([ // Install with dev dependencies in debug mode
|
||||||
'--no-dev',
|
'composer',
|
||||||
'--optimize-autoloader',
|
'install',
|
||||||
'--no-interaction',
|
'--no-interaction',
|
||||||
'--no-progress',
|
'--no-progress',
|
||||||
], 'Install PHP dependencies', 600);
|
], 'Install PHP dependencies', 600);
|
||||||
|
} else {
|
||||||
|
$this->runCommand([
|
||||||
|
'composer',
|
||||||
|
'install',
|
||||||
|
'--no-dev',
|
||||||
|
'--optimize-autoloader',
|
||||||
|
'--no-interaction',
|
||||||
|
'--no-progress',
|
||||||
|
], 'Install PHP dependencies', 600);
|
||||||
|
}
|
||||||
$log('composer', 'Installed/updated PHP dependencies', true, microtime(true) - $stepStart);
|
$log('composer', 'Installed/updated PHP dependencies', true, microtime(true) - $stepStart);
|
||||||
|
|
||||||
// Step 8: Install frontend dependencies
|
// Step 8: Install frontend dependencies
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue