Merge branch 'release' into 'master'

PB-29625 Update composer/composer See merge request passbolt/passbolt-ce-api!231
passbolt · Feb 12, 2024 · 1cd9d73 · 1cd9d73
2 parents 66bfdd8 + 2657800
commit 1cd9d73
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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:

diff --git 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