From 10b63c1f65bd38f4d75a1c049d9dedaf9dffddde Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Thu, 31 Aug 2023 18:22:11 +0100 Subject: [PATCH] Fixed ZF1F version in composer.json to avoid conflicts with our patches (#3475) --- .github/workflows/composer.yml | 2 +- composer.json | 2 +- composer.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml index 56929a37c25..d08f59ec6ac 100644 --- a/.github/workflows/composer.yml +++ b/.github/workflows/composer.yml @@ -26,4 +26,4 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Validate composer - run: composer validate --strict + run: composer validate --strict --no-check-all diff --git a/composer.json b/composer.json index ed272c093ab..46cc0c203ad 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "pelago/emogrifier": "^7.0", "phpseclib/mcrypt_compat": "^2.0.3", "phpseclib/phpseclib": "^3.0.14", - "shardj/zf1-future": "^1.22", + "shardj/zf1-future": "1.23.5", "symfony/polyfill-php74": "^1.27", "symfony/polyfill-php80": "^1.27", "symfony/polyfill-php81": "^1.27" diff --git a/composer.lock b/composer.lock index 9282a4d814b..ebe75fa6c8f 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": "902e142809dc8d50b1e628dad67320a2", + "content-hash": "d2c7d1ef752587a200077be1ef2a74de", "packages": [ { "name": "colinmollenhour/cache-backend-redis",