From 84b10db5e41f2a0a124babef3fab0d7ff998e0c4 Mon Sep 17 00:00:00 2001 From: Juan Pablo Ramirez Date: Mon, 12 Feb 2024 11:30:21 +0100 Subject: [PATCH 1/3] PB-29680 Update composer/composer to v2.7.0 --- composer.json | 2 +- composer.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index cb0714d0f7..f7363e8dfa 100644 --- a/composer.json +++ b/composer.json @@ -74,7 +74,7 @@ "ext-openssl": "*", "ext-pdo": "*", "ext-curl": "*", - "composer/composer": "^2.6.4", + "composer/composer": "^2.7.0", "cakephp/cakephp": "^4.4.15", "cakephp/chronos": "2.4.*", "longwave/laminas-diactoros": "^2.14.1", diff --git a/composer.lock b/composer.lock index d94e3752fc..f9faf9c5ad 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": "a3b35da33812bc79c4e98fb829190cf7", + "content-hash": "a897d3f433e85c8fbe82e53202a0d464", "packages": [ { "name": "bacon/bacon-qr-code", @@ -792,16 +792,16 @@ }, { "name": "composer/composer", - "version": "2.6.4", + "version": "2.7.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60" + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/d75d17c16a863438027d1d96401cddcd6aa5bb60", - "reference": "d75d17c16a863438027d1d96401cddcd6aa5bb60", + "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", "shasum": "" }, "require": { @@ -833,7 +833,7 @@ "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1", "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.0 || ^7" + "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -846,7 +846,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" }, "phpstan": { "includes": [ @@ -886,7 +886,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.6.4" + "source": "https://github.com/composer/composer/tree/2.7.1" }, "funding": [ { @@ -902,7 +902,7 @@ "type": "tidelift" } ], - "time": "2023-09-29T08:54:47+00:00" + "time": "2024-02-09T14:26:28+00:00" }, { "name": "composer/metadata-minifier", @@ -8832,5 +8832,5 @@ "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From f32f44674960287a48de2effedffddc7974b55f5 Mon Sep 17 00:00:00 2001 From: Ishan Vyas Date: Fri, 9 Feb 2024 15:55:06 +0530 Subject: [PATCH 2/3] PB-29625 Set COMPOSER_ALLOW_SUPERUSER to fix pipelines failing See: https://github.com/composer/composer/issues/11839 --- .gitlab-ci/jobs/php_unit_tests/runner.yml | 2 ++ .gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml | 1 + .gitlab-ci/jobs/security_check.yml | 1 + 3 files changed, 4 insertions(+) diff --git a/.gitlab-ci/jobs/php_unit_tests/runner.yml b/.gitlab-ci/jobs/php_unit_tests/runner.yml index acda2d9835..a27c8ee58d 100644 --- a/.gitlab-ci/jobs/php_unit_tests/runner.yml +++ b/.gitlab-ci/jobs/php_unit_tests/runner.yml @@ -51,6 +51,8 @@ KUBERNETES_SERVICE_CPU_REQUEST: 1 KUBERNETES_SERVICE_MEMORY_REQUEST: 3Gi + + COMPOSER_ALLOW_SUPERUSER: 1 services: - $CI_REGISTRY_USER/dind:latest script: diff --git a/.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml b/.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml index 75cf19aeef..199b8efd64 100644 --- a/.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml +++ b/.gitlab-ci/jobs/php_unit_tests/sequential/php_unit_tests.yml @@ -75,6 +75,7 @@ # This is the development dummy fingerprint PASSBOLT_GPG_SERVER_KEY_FINGERPRINT: 2FC8945833C51946E937F9FED47B0811573EE67E PHPUNIT_COMMAND: vendor/bin/phpunit --log-junit unitreport.xml + COMPOSER_ALLOW_SUPERUSER: 1 image: $CI_REGISTRY_IMAGE_TEST:$PHP_VERSION script: - cp config/app.default.php config/app.php diff --git a/.gitlab-ci/jobs/security_check.yml b/.gitlab-ci/jobs/security_check.yml index c34ffe946f..aa4f129e5c 100644 --- a/.gitlab-ci/jobs/security_check.yml +++ b/.gitlab-ci/jobs/security_check.yml @@ -2,6 +2,7 @@ stage: unit-test variables: PHP_VERSION: "7.4" + COMPOSER_ALLOW_SUPERUSER: 1 image: $CI_REGISTRY_IMAGE_TEST:$PHP_VERSION allow_failure: true script: From e3ba1adadabf5cac1f581f780225e6229287f605 Mon Sep 17 00:00:00 2001 From: Juan Pablo Ramirez Date: Mon, 12 Feb 2024 12:21:41 +0100 Subject: [PATCH 3/3] PB-29680 Update composer/composer to v2.7.0 --- composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.lock b/composer.lock index f9faf9c5ad..f596a891c2 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": "a897d3f433e85c8fbe82e53202a0d464", + "content-hash": "11c134b8bc0976d0e4a6d6f722528049", "packages": [ { "name": "bacon/bacon-qr-code",