From c61f6197f6d2600d6b036d712df83e27f883ba34 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 16 Nov 2021 18:22:30 +0100
Subject: update to 4.2.0

allow psr/container 1.1
---
 composer.json              |  2 +-
 php-league-container4.spec | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 5165cce..423d3b1 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "psr/container": "^2.0.0"
+        "psr/container": "^1.1 || ^2.0"
     },
     "require-dev": {
         "nette/php-generator": "^3.4",
diff --git a/php-league-container4.spec b/php-league-container4.spec
index cf81ec1..96d6b3d 100644
--- a/php-league-container4.spec
+++ b/php-league-container4.spec
@@ -11,8 +11,8 @@
 
 %global github_owner     thephpleague
 %global github_name      container
-%global github_version   4.1.2
-%global github_commit    82a57588c630663d2600f046753b23ab6dcda9b5
+%global github_version   4.2.0
+%global github_commit    375d13cb828649599ef5d48a339c4af7a26cd0ab
 
 %global major            4
 
@@ -21,8 +21,8 @@
 
 # "php": "^7.2 || ^8.0"
 %global php_min_ver 7.2
-# "psr/container": "^2.0.0"
-%global psr_container_min_ver 2.0.0
+# "psr/container": "^1.1 || ^2.0"
+%global psr_container_min_ver 1.1
 %global psr_container_max_ver 3
 
 # Build using "--without tests" to disable tests
@@ -108,7 +108,10 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('League\\Container\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Psr/Container2/autoload.php',
+    [
+        '%{phpdir}/Psr/Container2/autoload.php',
+        '%{phpdir}/Psr/Container/autoload.php',
+    ]
 ]);
 AUTOLOAD
 
@@ -135,7 +138,7 @@ sed -e '/log/d' -i phpunit.xml
 RETURN_CODE=0
 # TODO PHP 8.1, Call to undefined method ReflectionUnionType::getName()
 PHPUNIT=$(which phpunit8)
-for PHP_EXEC in php php73 php74 php80 php81; do
+for PHP_EXEC in php php74 php80 php81; do
     if which $PHP_EXEC; then
         FILTER=""
         VER=$($PHP_EXEC -r 'echo PHP_VERSION_ID;')
@@ -166,6 +169,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Nov 16 2021 Remi Collet <remi@remirepo.net> - 4.2.0-1
+- update to 4.2.0
+- allow psr/container 1.1
+
 * Fri Jul  9 2021 Remi Collet <remi@remirepo.net> - 3.4.1-1
 - update to 4.1.2
 - rename to php-league-container4
-- 
cgit