From 28779c6afa5f7f40b58d3351cb98ccfab8ecf5aa Mon Sep 17 00:00:00 2001
From: Bob van de Vijver <bobvandevijver@users.noreply.github.com>
Date: Tue, 19 Oct 2021 10:52:43 +0200
Subject: [PATCH] refactor(composer): use update for lock file maintenance
(#12185)
---
.../composer/__snapshots__/artifacts.spec.ts.snap | 2 +-
lib/manager/composer/artifacts.ts | 9 ++-------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
index faf3075dd2..51f7538dda 100644
--- a/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
+++ b/lib/manager/composer/__snapshots__/artifacts.spec.ts.snap
@@ -73,7 +73,7 @@ Array [
exports[`manager/composer/artifacts performs lockFileMaintenance 1`] = `
Array [
Object {
- "cmd": "composer install --ignore-platform-reqs --no-ansi --no-interaction --no-scripts --no-autoloader --no-plugins",
+ "cmd": "composer update --ignore-platform-reqs --no-ansi --no-interaction --no-scripts --no-autoloader --no-plugins",
"options": Object {
"cwd": "/tmp/github/some/repo",
"encoding": "utf-8",
diff --git a/lib/manager/composer/artifacts.ts b/lib/manager/composer/artifacts.ts
index 50862c753b..0506e26c0e 100644
--- a/lib/manager/composer/artifacts.ts
+++ b/lib/manager/composer/artifacts.ts
@@ -10,7 +10,6 @@ import * as datasourcePackagist from '../../datasource/packagist';
import { logger } from '../../logger';
import { ExecOptions, exec } from '../../util/exec';
import {
- deleteLocalFile,
ensureCacheDir,
ensureLocalDir,
getSiblingFileName,
@@ -102,10 +101,6 @@ export async function updateArtifacts({
...config.constraints,
};
- if (config.isLockFileMaintenance) {
- await deleteLocalFile(lockFileName);
- }
-
const preCommands: string[] = [
`install-tool composer ${await getComposerConstraint(constraints)}`,
];
@@ -126,7 +121,7 @@ export async function updateArtifacts({
const cmd = 'composer';
let args: string;
if (config.isLockFileMaintenance) {
- args = 'install';
+ args = 'update';
} else {
args =
(
@@ -166,7 +161,7 @@ export async function updateArtifacts({
return res;
}
- logger.debug(`Commiting vendor files in ${vendorDir}`);
+ logger.debug(`Committing vendor files in ${vendorDir}`);
for (const f of [...status.modified, ...status.not_added]) {
if (f.startsWith(vendorDir)) {
res.push({
--
GitLab