From 1c35a51553c5025ec2b0224be62a0ca2eb95a650 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 2 Sep 2020 14:33:05 +0200
Subject: [PATCH] Fix mismatch between composer.lock and composer.json
The composer.lock file that was committed to the repository did not
match composer.json. It was built from a composer.json with an extra
section to override the PHP version check:
"config": {
"platform": {
"php": "7.1.33"
}
}
Rebuild composer.lock without that config section, to prevent warnings
from Composer due to the mismatch.
---
composer.lock | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/composer.lock b/composer.lock
index 972817d4c..c246c091d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "f5bf19931f73cc09d7a4ce127b75b30e",
+ "content-hash": "10ace42afd0f39a29a7e847743677137",
"packages": [
{
"name": "gettext/gettext",
@@ -7003,8 +7003,5 @@
"platform-dev": {
"ext-curl": "*"
},
- "platform-overrides": {
- "php": "7.1.33"
- },
"plugin-api-version": "1.1.0"
}
--
GitLab