From 48669e539bfe65aabcedf8ad5f727e9cc6f66e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Tue, 6 Oct 2020 18:55:35 +0200 Subject: [PATCH 1/2] qa: remove cache dependency to avoid circular dependency conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- CHANGELOG.md | 2 +- composer.json | 102 +++++++++++++++++++++++++------------------------- 2 files changed, 53 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fff0c4..cdead74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse ### Removed -- Nothing. +- Remove `laminas/laminas-cache` dependency to avoid circular dependencies. ### Fixed diff --git a/composer.json b/composer.json index 09a9487..d1341c7 100644 --- a/composer.json +++ b/composer.json @@ -1,53 +1,55 @@ { - "name": "laminas/laminas-cache-storage-adapter-apcu", - "description": "Laminas cache adapter for apcu", - "keywords": [ - "laminas", - "cache" - ], - "license": "BSD-3-Clause", - "require": { - "php": "^5.6 || ^7.0", - "laminas/laminas-cache": "^2.10@dev" - }, - "provide": { - "laminas/laminas-cache-storage-implementation": "1.0" - }, - "require-dev": { - "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", - "laminas/laminas-coding-standard": "~1.0.0", - "squizlabs/php_codesniffer": "^2.7" - }, - "config": { - "sort-packages": true - }, - "extra": { - }, - "autoload": { - "psr-4": { - "Laminas\\Cache\\Storage\\Adapter\\": "src/" - } - }, - "autoload-dev": { - "psr-4": { - "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", - "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" - } - }, - "scripts": { - "cs-check": "phpcs", - "cs-fix": "phpcbf", - "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" - }, - "suggest": { - "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter" - }, - "support": { - "issues": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/issues", - "forum": "https://discourse.laminas.dev/", - "source": "https://github.com/laminas/laminas-cache-storage-adapter-apcu", - "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-apcu/", - "rss": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/releases.atom" + "name": "laminas/laminas-cache-storage-adapter-apcu", + "description": "Laminas cache adapter for apcu", + "keywords": [ + "laminas", + "cache" + ], + "license": "BSD-3-Clause", + "require": { + "php": "^5.6 || ^7.0" + }, + "provide": { + "laminas/laminas-cache-storage-implementation": "1.0" + }, + "require-dev": { + "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", + "laminas/laminas-coding-standard": "~1.0.0", + "squizlabs/php_codesniffer": "^2.7", + "laminas/laminas-cache": "^2.10" + }, + "config": { + "sort-packages": true + }, + "extra": {}, + "autoload": { + "psr-4": { + "Laminas\\Cache\\Storage\\Adapter\\": "src/" } + }, + "autoload-dev": { + "psr-4": { + "LaminasTest\\Cache\\Storage\\Adapter\\": "test/unit", + "LaminasTest\\Cache\\Psr\\": "test/integration/Psr" + } + }, + "scripts": { + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" + }, + "suggest": { + "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter" + }, + "support": { + "issues": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/issues", + "forum": "https://discourse.laminas.dev/", + "source": "https://github.com/laminas/laminas-cache-storage-adapter-apcu", + "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-apcu/", + "rss": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/releases.atom" + }, + "conflict": { + "laminas/laminas-cache": "<2.10" + } } From ae8602136ed42f0e853e60076ffa470f2eaaf0df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20B=C3=B6sing?= <2189546+boesing@users.noreply.github.com> Date: Tue, 6 Oct 2020 18:57:49 +0200 Subject: [PATCH 2/2] qa: normalized \`composer.json\` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Bösing <2189546+boesing@users.noreply.github.com> --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index d1341c7..c2565b4 100644 --- a/composer.json +++ b/composer.json @@ -9,14 +9,20 @@ "require": { "php": "^5.6 || ^7.0" }, + "conflict": { + "laminas/laminas-cache": "<2.10" + }, "provide": { "laminas/laminas-cache-storage-implementation": "1.0" }, "require-dev": { + "laminas/laminas-cache": "^2.10", "laminas/laminas-cache-storage-adapter-test": "^1.0@dev", "laminas/laminas-coding-standard": "~1.0.0", - "squizlabs/php_codesniffer": "^2.7", - "laminas/laminas-cache": "^2.10" + "squizlabs/php_codesniffer": "^2.7" + }, + "suggest": { + "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter" }, "config": { "sort-packages": true @@ -39,17 +45,11 @@ "test": "phpunit --colors=always", "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" }, - "suggest": { - "ext-apcu": "APCU >= 5.1.0, to use the APCu storage adapter" - }, "support": { "issues": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/issues", "forum": "https://discourse.laminas.dev/", "source": "https://github.com/laminas/laminas-cache-storage-adapter-apcu", "docs": "https://docs.laminas.dev/laminas-cache-storage-adapter-apcu/", "rss": "https://github.com/laminas/laminas-cache-storage-adapter-apcu/releases.atom" - }, - "conflict": { - "laminas/laminas-cache": "<2.10" } }