From f1014bf05d119a29d2e770ef9411fa6d9a0644eb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:55:19 +0000 Subject: [PATCH 1/2] Update dependency laminas/laminas-servicemanager to ^3.22.1 | datasource | package | from | to | | ---------- | ------------------------------ | ------ | ------ | | packagist | laminas/laminas-servicemanager | 3.15.0 | 3.22.1 | --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 35b9b5a..d1dfc28 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "ext-sqlite3": "*", "doctrine/coding-standard": "^12.0.0", "illuminate/container": "^10.29", - "laminas/laminas-servicemanager": "^3.15", + "laminas/laminas-servicemanager": "^3.22.1", "phpunit/phpunit": "^10.4.2", "psalm/plugin-phpunit": "^0.18.4", "symfony/yaml": "^6.3.3", From e172722ba90dbc822aa9fc7f01d144dcb0347412 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Fri, 27 Oct 2023 15:16:56 +0200 Subject: [PATCH 2/2] Move example deps outside library ones, so that test can use both lower and upper versions of `psr/container` --- .gitignore | 2 + Makefile | 1 + composer.json | 3 - composer.lock | 305 +---------------------------- example/composer.json | 14 ++ example/illuminate-container.php | 1 + example/laminas-servicemanager.php | 1 + phpcs.xml | 8 +- 8 files changed, 27 insertions(+), 308 deletions(-) create mode 100644 example/composer.json diff --git a/.gitignore b/.gitignore index 53b6ba8..d937403 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +/example/composer.lock +/example/vendor /vendor .phpunit.result.cache diff --git a/Makefile b/Makefile index 8e4d855..1fbd817 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ static-analysis: ## verify that no static analysis issues were introduced vendor/bin/psalm check-example: + composer update --working-dir=example test/example/check-example.sh bc-check: ## check for backwards compatibility breaks diff --git a/composer.json b/composer.json index d1dfc28..920a29d 100644 --- a/composer.json +++ b/composer.json @@ -29,10 +29,7 @@ "psr/container": "^1.0 || ^2.0" }, "require-dev": { - "ext-sqlite3": "*", "doctrine/coding-standard": "^12.0.0", - "illuminate/container": "^10.29", - "laminas/laminas-servicemanager": "^3.22.1", "phpunit/phpunit": "^10.4.2", "psalm/plugin-phpunit": "^0.18.4", "symfony/yaml": "^6.3.3", diff --git a/composer.lock b/composer.lock index d2b7331..47fda74 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": "dd8c00e620c0bb5728559189e8134889", + "content-hash": "5eafb145a390fc452e53e27322a1f32c", "packages": [ { "name": "doctrine/annotations", @@ -3043,254 +3043,6 @@ ], "time": "2022-12-24T12:35:10+00:00" }, - { - "name": "illuminate/container", - "version": "v10.29.0", - "source": { - "type": "git", - "url": "https://github.com/illuminate/container.git", - "reference": "ddc26273085fad3c471b2602ad820e0097ff7939" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939", - "reference": "ddc26273085fad3c471b2602ad820e0097ff7939", - "shasum": "" - }, - "require": { - "illuminate/contracts": "^10.0", - "php": "^8.1", - "psr/container": "^1.1.1|^2.0.1" - }, - "provide": { - "psr/container-implementation": "1.1|2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "10.x-dev" - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Container\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Illuminate Container package.", - "homepage": "https://laravel.com", - "support": { - "issues": "https://github.com/laravel/framework/issues", - "source": "https://github.com/laravel/framework" - }, - "time": "2023-06-18T09:12:03+00:00" - }, - { - "name": "illuminate/contracts", - "version": "v10.29.0", - "source": { - "type": "git", - "url": "https://github.com/illuminate/contracts.git", - "reference": "6c39fba7b2311e28f5c6ac7d729e3d49a2a98406" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/6c39fba7b2311e28f5c6ac7d729e3d49a2a98406", - "reference": "6c39fba7b2311e28f5c6ac7d729e3d49a2a98406", - "shasum": "" - }, - "require": { - "php": "^8.1", - "psr/container": "^1.1.1|^2.0.1", - "psr/simple-cache": "^1.0|^2.0|^3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "10.x-dev" - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Contracts\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "The Illuminate Contracts package.", - "homepage": "https://laravel.com", - "support": { - "issues": "https://github.com/laravel/framework/issues", - "source": "https://github.com/laravel/framework" - }, - "time": "2023-09-05T19:07:46+00:00" - }, - { - "name": "laminas/laminas-servicemanager", - "version": "3.15.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "65910ef6a8066b0369fab77fbec9e030be59c866" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/65910ef6a8066b0369fab77fbec9e030be59c866", - "reference": "65910ef6a8066b0369fab77fbec9e030be59c866", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0", - "laminas/laminas-stdlib": "^3.2.1", - "php": "~7.4.0 || ~8.0.0 || ~8.1.0", - "psr/container": "^1.1 || ^2.0.2" - }, - "conflict": { - "ext-psr": "*", - "laminas/laminas-code": "<3.3.1", - "zendframework/zend-code": "<3.3.1", - "zendframework/zend-servicemanager": "*" - }, - "provide": { - "psr/container-implementation": "^1.1 || ^2.0" - }, - "replace": { - "container-interop/container-interop": "^1.2.0" - }, - "require-dev": { - "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-container-config-test": "^0.6", - "mikey179/vfsstream": "^1.6.10@alpha", - "ocramius/proxy-manager": "^2.11", - "phpbench/phpbench": "^1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.5", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.8" - }, - "suggest": { - "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services" - }, - "bin": [ - "bin/generate-deps-for-config-factory", - "bin/generate-factory-for-class" - ], - "type": "library", - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Factory-Driven Dependency Injection Container", - "homepage": "https://laminas.dev", - "keywords": [ - "PSR-11", - "dependency-injection", - "di", - "dic", - "laminas", - "service-manager", - "servicemanager" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-servicemanager/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-servicemanager/issues", - "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom", - "source": "https://github.com/laminas/laminas-servicemanager" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2022-07-18T21:18:56+00:00" - }, - { - "name": "laminas/laminas-stdlib", - "version": "3.18.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", - "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", - "shasum": "" - }, - "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" - }, - "conflict": { - "zendframework/zend-stdlib": "*" - }, - "require-dev": { - "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.14", - "phpunit/phpunit": "^10.3.3", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.15.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\Stdlib\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "SPL extensions, array utilities, error handlers, and more", - "homepage": "https://laminas.dev", - "keywords": [ - "laminas", - "stdlib" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-stdlib/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-stdlib/issues", - "rss": "https://github.com/laminas/laminas-stdlib/releases.atom", - "source": "https://github.com/laminas/laminas-stdlib" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2023-09-19T10:15:21+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.11.1", @@ -4265,57 +4017,6 @@ }, "time": "2022-12-03T07:47:07+00:00" }, - { - "name": "psr/simple-cache", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865", - "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865", - "shasum": "" - }, - "require": { - "php": ">=8.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/3.0.0" - }, - "time": "2021-10-29T13:26:27+00:00" - }, { "name": "sebastian/cli-parser", "version": "2.0.0", @@ -5777,9 +5478,7 @@ "platform": { "php": "~8.1.0 || ~8.2.0" }, - "platform-dev": { - "ext-sqlite3": "*" - }, + "platform-dev": [], "platform-overrides": { "php": "8.1.99" }, diff --git a/example/composer.json b/example/composer.json new file mode 100644 index 0000000..0b50d85 --- /dev/null +++ b/example/composer.json @@ -0,0 +1,14 @@ +{ + "type": "project", + "require": { + "php": "~8.1.0 || ~8.2.0", + "illuminate/container": "^10.29", + "laminas/laminas-servicemanager": "^3.22.1" + }, + "config": { + "platform": { + "php": "8.1.99" + }, + "sort-packages": true + } +} diff --git a/example/illuminate-container.php b/example/illuminate-container.php index 0537d61..bd1b022 100644 --- a/example/illuminate-container.php +++ b/example/illuminate-container.php @@ -6,6 +6,7 @@ use Illuminate\Container\Container; use Roave\PsrContainerDoctrine\EntityManagerFactory; +require_once __DIR__ . '/vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php'; // Standard config keys diff --git a/example/laminas-servicemanager.php b/example/laminas-servicemanager.php index bf49b88..3ed2efd 100644 --- a/example/laminas-servicemanager.php +++ b/example/laminas-servicemanager.php @@ -6,6 +6,7 @@ use Laminas\ServiceManager\ServiceManager; use Roave\PsrContainerDoctrine\EntityManagerFactory; +require_once __DIR__ . '/vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php'; // Standard config keys diff --git a/phpcs.xml b/phpcs.xml index d654876..98029a9 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -1,6 +1,11 @@ - + ./example + ./example/vendor ./src ./test @@ -10,4 +15,3 @@ -