From a0680fc3ec851f65aefe6de42a855794dec31554 Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 3 Nov 2022 15:02:01 +0000 Subject: [PATCH 1/2] Add Support for PHP 8.2 --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ebef230..f4ab151 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } }, "require": { - "php": "^7.3 || ~8.0 || ~8.1", + "php": "^7.3 || ~8.0 || ~8.1 || ~8.2", "laminas/laminas-stdlib": "^3.6", "psr/container": "^1.0 || ^2.0", "symfony/console": "^5.4", diff --git a/composer.lock b/composer.lock index c9b1790..837c623 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": "52d0b419f7dc907c553e5d24ffedefa6", + "content-hash": "6d41bb7f07d47b73aacf0b2f5e0bf357", "packages": [ { "name": "laminas/laminas-stdlib", @@ -6062,7 +6062,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.3 || ~8.0 || ~8.1" + "php": "^7.3 || ~8.0 || ~8.1 || ~8.2" }, "platform-dev": [], "platform-overrides": { From 990d166ce55b2a9cbb510b02aeb160d30615a1e1 Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 3 Nov 2022 15:05:55 +0000 Subject: [PATCH 2/2] Remove `laminas-component-installer` - there's no need to require it in a library --- composer.json | 4 +-- composer.lock | 71 +-------------------------------------------------- 2 files changed, 2 insertions(+), 73 deletions(-) diff --git a/composer.json b/composer.json index f4ab151..77539eb 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,7 @@ "config": { "sort-packages": true, "allow-plugins": { - "dealerdirect/phpcodesniffer-composer-installer": true, - "laminas/laminas-component-installer": true + "dealerdirect/phpcodesniffer-composer-installer": true }, "platform": { "php": "7.3.99" @@ -32,7 +31,6 @@ "require-dev": { "doctrine/coding-standard": "^10.0.0", "laminas/laminas-cli": "^1.2.0", - "laminas/laminas-component-installer": "^2.5.1", "laminas/laminas-config-aggregator": "^1.7", "laminas/laminas-servicemanager": "^3.7.0", "lctrs/psalm-psr-container-plugin": "^1.6", diff --git a/composer.lock b/composer.lock index 837c623..776afc8 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": "6d41bb7f07d47b73aacf0b2f5e0bf357", + "content-hash": "133fc7553a4bce3aa257857981ddca08", "packages": [ { "name": "laminas/laminas-stdlib", @@ -2724,75 +2724,6 @@ ], "time": "2021-09-20T14:36:45+00:00" }, - { - "name": "laminas/laminas-component-installer", - "version": "2.5.1", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-component-installer.git", - "reference": "6f1e11473861e4e2208178b1dfa395a992039674" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-component-installer/zipball/6f1e11473861e4e2208178b1dfa395a992039674", - "reference": "6f1e11473861e4e2208178b1dfa395a992039674", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.3 || ~8.0.0" - }, - "replace": { - "zendframework/zend-component-installer": "^2.1.2" - }, - "require-dev": { - "composer/composer": "^1.5.2 || ^2.0", - "laminas/laminas-coding-standard": "~2.1.4", - "malukenho/docheader": "^0.1.6", - "mikey179/vfsstream": "^1.6.7", - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.13.0", - "vimeo/psalm": "^4.2", - "webmozart/assert": "^1.6" - }, - "type": "composer-plugin", - "extra": { - "class": "Laminas\\ComponentInstaller\\ComponentInstaller" - }, - "autoload": { - "psr-4": { - "Laminas\\ComponentInstaller\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Composer plugin for injecting modules and configuration providers into application configuration", - "homepage": "https://laminas.dev", - "keywords": [ - "component installer", - "composer", - "laminas", - "plugin" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-component-installer/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-component-installer/issues", - "rss": "https://github.com/laminas/laminas-component-installer/releases.atom", - "source": "https://github.com/laminas/laminas-component-installer" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-09-30T12:20:49+00:00" - }, { "name": "laminas/laminas-config-aggregator", "version": "1.7.0",