From 854ed622bda2c65e4007d088c0708340bb51cd6c Mon Sep 17 00:00:00 2001
From: Robert Lange <robert.lange@uni-leipzig.de>
Date: Mon, 4 Sep 2023 22:14:39 +0200
Subject: [PATCH] refs #23937 [fid] docker: make composer version configurable
* keep composer 1 for fid due to ocramius package conflicts from modules
---
.env.local | 2 +-
composer.lock | 279 +++++++++++++++++++++++++-------------------------
2 files changed, 140 insertions(+), 141 deletions(-)
diff --git a/.env.local b/.env.local
index cda5e645172..4b6978720ea 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ JIT_GRUNT=^0.10.0
NODE_SASS=^7.0.1
# Dependencies for composer task (loads files for vendor): composer1 | composer2
-COMPOSER_VERSION=composer2
+COMPOSER_VERSION=composer1
# Version for php in PHP container: php7_2 | php8_0
PHP_VERSION=php7_2
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 4c1a6574774..4a993969308 100644
--- a/composer.lock
+++ b/composer.lock
@@ -841,7 +841,6 @@
"jasig"
],
"abandoned": "apereo/phpcas",
- "abandoned": "apereo/phpcas",
"time": "2019-08-18T20:01:55+00:00"
},
{
@@ -2107,6 +2106,87 @@
"description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.",
"time": "2020-10-30T14:51:02+00:00"
},
+ {
+ "name": "laminas/laminas-diactoros",
+ "version": "2.2.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-diactoros.git",
+ "reference": "064f0b20e832bb232d0311f915c7422fef1b1857"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/064f0b20e832bb232d0311f915c7422fef1b1857",
+ "reference": "064f0b20e832bb232d0311f915c7422fef1b1857",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^7.1",
+ "psr/http-factory": "^1.0",
+ "psr/http-message": "^1.0"
+ },
+ "provide": {
+ "psr/http-factory-implementation": "1.0",
+ "psr/http-message-implementation": "1.0"
+ },
+ "replace": {
+ "zendframework/zend-diactoros": "self.version"
+ },
+ "require-dev": {
+ "ext-curl": "*",
+ "ext-dom": "*",
+ "ext-libxml": "*",
+ "http-interop/http-factory-tests": "^0.5.0",
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "php-http/psr7-integration-tests": "dev-master",
+ "phpunit/phpunit": "^7.0.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.1.x-dev",
+ "dev-develop": "2.2.x-dev",
+ "dev-release-1.8": "1.8.x-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "src/functions/create_uploaded_file.php",
+ "src/functions/marshal_headers_from_sapi.php",
+ "src/functions/marshal_method_from_sapi.php",
+ "src/functions/marshal_protocol_version_from_sapi.php",
+ "src/functions/marshal_uri_from_sapi.php",
+ "src/functions/normalize_server.php",
+ "src/functions/normalize_uploaded_files.php",
+ "src/functions/parse_cookie_header.php",
+ "src/functions/create_uploaded_file.legacy.php",
+ "src/functions/marshal_headers_from_sapi.legacy.php",
+ "src/functions/marshal_method_from_sapi.legacy.php",
+ "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+ "src/functions/marshal_uri_from_sapi.legacy.php",
+ "src/functions/normalize_server.legacy.php",
+ "src/functions/normalize_uploaded_files.legacy.php",
+ "src/functions/parse_cookie_header.legacy.php"
+ ],
+ "psr-4": {
+ "Laminas\\Diactoros\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR HTTP Message implementations",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
+ ],
+ "time": "2019-12-31T16:41:56+00:00"
+ },
{
"name": "laminas/laminas-dom",
"version": "2.7.2",
@@ -3467,6 +3547,63 @@
],
"time": "2020-09-10T14:44:15+00:00"
},
+ {
+ "name": "laminas/laminas-psr7bridge",
+ "version": "1.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/laminas/laminas-psr7bridge.git",
+ "reference": "61ab5a9908a968c363b9562645a8a7e7ea086c22"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/laminas/laminas-psr7bridge/zipball/61ab5a9908a968c363b9562645a8a7e7ea086c22",
+ "reference": "61ab5a9908a968c363b9562645a8a7e7ea086c22",
+ "shasum": ""
+ },
+ "require": {
+ "laminas/laminas-diactoros": "^1.7 || ^2.0",
+ "laminas/laminas-http": "^2.7",
+ "laminas/laminas-zendframework-bridge": "^1.0",
+ "php": "^5.6 || ^7.0",
+ "psr/http-message": "^1.0"
+ },
+ "conflict": {
+ "laminas/laminas-stdlib": "< 3.2.1"
+ },
+ "replace": {
+ "zendframework/zend-psr7bridge": "self.version"
+ },
+ "require-dev": {
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.15 || ^6.5.6"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev",
+ "dev-develop": "1.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laminas\\Psr7Bridge\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "PSR-7 <-> laminas-http message conversions",
+ "homepage": "https://laminas.dev",
+ "keywords": [
+ "http",
+ "laminas",
+ "psr",
+ "psr-7"
+ ],
+ "time": "2019-12-31T17:38:49+00:00"
+ },
{
"name": "laminas/laminas-recaptcha",
"version": "3.2.0",
@@ -6351,20 +6488,6 @@
"support": {
"source": "https://github.com/symfony/filesystem/tree/v3.4.47"
},
- "funding": [
- {
- "url": "https://symfony.com/sponsor",
- "type": "custom"
- },
- {
- "url": "https://github.com/fabpot",
- "type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
- "type": "tidelift"
- }
- ],
"time": "2020-10-24T10:57:07+00:00"
},
{
@@ -7738,129 +7861,6 @@
"description": "PDO userspace driver proxying calls to PHP OCI8 driver",
"time": "2020-12-11T12:29:18+00:00"
},
- {
- "name": "zendframework/zend-diactoros",
- "version": "2.2.1",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-diactoros.git",
- "reference": "de5847b068362a88684a55b0dbb40d85986cfa52"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/de5847b068362a88684a55b0dbb40d85986cfa52",
- "reference": "de5847b068362a88684a55b0dbb40d85986cfa52",
- "shasum": ""
- },
- "require": {
- "php": "^7.1",
- "psr/http-factory": "^1.0",
- "psr/http-message": "^1.0"
- },
- "provide": {
- "psr/http-factory-implementation": "1.0",
- "psr/http-message-implementation": "1.0"
- },
- "require-dev": {
- "ext-curl": "*",
- "ext-dom": "*",
- "ext-libxml": "*",
- "http-interop/http-factory-tests": "^0.5.0",
- "php-http/psr7-integration-tests": "dev-master",
- "phpunit/phpunit": "^7.0.2",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.1.x-dev",
- "dev-develop": "2.2.x-dev",
- "dev-release-1.8": "1.8.x-dev"
- }
- },
- "autoload": {
- "files": [
- "src/functions/create_uploaded_file.php",
- "src/functions/marshal_headers_from_sapi.php",
- "src/functions/marshal_method_from_sapi.php",
- "src/functions/marshal_protocol_version_from_sapi.php",
- "src/functions/marshal_uri_from_sapi.php",
- "src/functions/normalize_server.php",
- "src/functions/normalize_uploaded_files.php",
- "src/functions/parse_cookie_header.php"
- ],
- "psr-4": {
- "Zend\\Diactoros\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "PSR HTTP Message implementations",
- "keywords": [
- "http",
- "psr",
- "psr-7"
- ],
- "abandoned": "laminas/laminas-diactoros",
- "time": "2019-11-13T19:16:13+00:00"
- },
- {
- "name": "zendframework/zend-psr7bridge",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/zend-psr7bridge.git",
- "reference": "99c558f96be01d535fc9692250312342d76d4098"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-psr7bridge/zipball/99c558f96be01d535fc9692250312342d76d4098",
- "reference": "99c558f96be01d535fc9692250312342d76d4098",
- "shasum": ""
- },
- "require": {
- "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0",
- "zendframework/zend-diactoros": "^1.7 || ^2.0",
- "zendframework/zend-http": "^2.7"
- },
- "conflict": {
- "zendframework/zend-stdlib": "< 3.2.1"
- },
- "require-dev": {
- "phpunit/phpunit": "^5.7.15 || ^6.5.6",
- "zendframework/zend-coding-standard": "~1.0.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev",
- "dev-develop": "1.3.x-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Zend\\Psr7Bridge\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "PSR-7 <-> zend-http message conversions",
- "keywords": [
- "ZendFramework",
- "http",
- "psr",
- "psr-7",
- "zend",
- "zf"
- ],
- "abandoned": "laminas/laminas-psr7bridge",
- "time": "2018-12-20T16:48:40+00:00"
- },
{
"name": "zfr/rbac",
"version": "1.2.0",
@@ -10647,6 +10647,5 @@
"platform-dev": [],
"platform-overrides": {
"php": "7.2"
- },
- "plugin-api-version": "2.3.0"
+ }
}
--
GitLab