From 9d2b63031b839327a03b41bf51810613278c87cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Demonchaux?= Date: Tue, 18 Oct 2022 10:23:44 +0200 Subject: [PATCH] Try resolve bi-directional dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Demonchaux --- .laminas-ci/pre-install.sh | 7 +++++ composer.json | 2 +- composer.lock | 63 +------------------------------------- 3 files changed, 9 insertions(+), 63 deletions(-) create mode 100644 .laminas-ci/pre-install.sh diff --git a/.laminas-ci/pre-install.sh b/.laminas-ci/pre-install.sh new file mode 100644 index 0000000..47bb37b --- /dev/null +++ b/.laminas-ci/pre-install.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Temporary workaround for cyclic dependencies - can be removed once 3.0 has been released + +echo "Branch as 2.99.x in Pre-Install" + +git checkout -b 2.99.x diff --git a/composer.json b/composer.json index 3ed77eb..0f6ccd0 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-mail": "~2.19.0", + "laminas/laminas-mail": "^2.19.0", "phpunit/phpunit": "~9.5.25" }, "suggest": { diff --git a/composer.lock b/composer.lock index b809cf5..2495251 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": "48dd1f507d14caff310d903104fcac0c", + "content-hash": "00a80a7fc74e8f70b9c97ea3791a1d84", "packages": [ { "name": "laminas/laminas-stdlib", @@ -401,67 +401,6 @@ ], "time": "2022-10-14T13:05:29+00:00" }, - { - "name": "laminas/laminas-mime", - "version": "2.10.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-mime.git", - "reference": "62a899a7c9100889c2d2386b1357003a2cb52fa9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/62a899a7c9100889c2d2386b1357003a2cb52fa9", - "reference": "62a899a7c9100889c2d2386b1357003a2cb52fa9", - "shasum": "" - }, - "require": { - "laminas/laminas-stdlib": "^2.7 || ^3.0", - "php": "^7.3 || ~8.0.0 || ~8.1.0" - }, - "conflict": { - "zendframework/zend-mime": "*" - }, - "require-dev": { - "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-mail": "^2.12", - "phpunit/phpunit": "^9.5" - }, - "suggest": { - "laminas/laminas-mail": "Laminas\\Mail component" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\Mime\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Create and parse MIME messages and parts", - "homepage": "https://laminas.dev", - "keywords": [ - "laminas", - "mime" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-mime/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-mime/issues", - "rss": "https://github.com/laminas/laminas-mime/releases.atom", - "source": "https://github.com/laminas/laminas-mime" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2022-08-30T09:38:41+00:00" - }, { "name": "laminas/laminas-servicemanager", "version": "3.19.0",