update to 3.3.5

switch to phpunit8
allow psr/container v2

2 files changed, 35 insertions, 16 deletions

diff --git a/composer.json b/composer.json
index 224c00c..d37a6a0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,12 +21,14 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "psr/container": "^1.0"
+        "php": "^7.0 || ^8.0",
+        "psr/container": "^1.0.0 || ^2.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "^6.0",
-        "squizlabs/php_codesniffer": "^3.3"
+        "phpunit/phpunit": "^6.0",
+        "roave/security-advisories": "dev-master",
+        "scrutinizer/ocular": "^1.8",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "provide": {
         "psr/container-implementation": "^1.0"
@@ -46,9 +48,15 @@
     },
     "extra": {
         "branch-alias": {
+            "dev-master": "3.x-dev",
             "dev-3.x": "3.x-dev",
             "dev-2.x": "2.x-dev",
             "dev-1.x": "1.x-dev"
         }
+    },
+    "scripts": {
+        "test": [
+            "phpunit"
+        ]
     }
 }
diff --git a/php-league-container.spec b/php-league-container.spec
index 3fa4acc..70ad328 100644
--- a/php-league-container.spec
+++ b/php-league-container.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-league-container
 #
-# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2021 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,17 +12,17 @@
 
 %global github_owner     thephpleague
 %global github_name      container
-%global github_version   3.2.2
-%global github_commit    fa38155fa392ad2ed05fb6418e9d9d58064c7e76
+%global github_version   3.3.5
+%global github_commit    048ab87810f508dbedbcb7ae941b606eb8ee353b
 
 %global composer_vendor  league
 %global composer_project container
 
 # "php": "^7.0"
 %global php_min_ver 7.0
-# "psr/container": "^1.0"
+# "psr/container": "^1.0.0 || ^2.0.0"
 %global psr_container_min_ver 1.0
-%global psr_container_max_ver 2.0
+%global psr_container_max_ver 3
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -47,7 +47,7 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit8
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(psr/container) >= %{psr_container_min_ver} with php-composer(psr/container) < %{psr_container_max_ver})
 %else
@@ -69,7 +69,7 @@ Requires:      (php-composer(psr/container) >= %{psr_container_min_ver} with php
 Requires:      php-composer(psr/container) >= %{psr_container_min_ver}
 Requires:      php-composer(psr/container) <  %{psr_container_max_ver}
 %endif
-# phpcompatinfo (computed from version 3.2.2)
+# phpcompatinfo (computed from version 3.3.5)
 Requires:      php-reflection
 Requires:      php-spl
 # Autoloader
@@ -102,9 +102,12 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('League\\Container\\', __DIR__);
 
-\Fedora\Autoloader\Dependencies::required(array(
-    '%{phpdir}/Psr/Container/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+    [
+        '%{phpdir}/Psr/Container2/autoload.php',
+        '%{phpdir}/Psr/Container/autoload.php',
+    ]
+]);
 AUTOLOAD
 
 
@@ -122,10 +125,13 @@ require '%{buildroot}%{phpdir}/League/Container/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('League\\Container\\Test\\', __DIR__.'/tests');
 BOOTSTRAP
 
+: cleanup for phpunit8/9
+sed -e '/log/d' -i phpunit.xml
+
 : Upstream tests
 RETURN_CODE=0
-PHPUNIT=$(which phpunit)
-for PHP_EXEC in php php71 php72 php73 php74; do
+PHPUNIT=$(which phpunit8)
+for PHP_EXEC in php php73 php74 php80; do
     if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --bootstrap bootstrap.php --verbose || RETURN_CODE=1
     fi
@@ -148,6 +154,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 3.3.5-1
+- update to 3.3.5
+- switch to phpunit8
+- allow psr/container v2
+
 * Sun Jun 16 2019 Shawn Iwinski <shawn@iwin.ski> - 3.2.2-1
 - Update to 3.2.2 (RHBZ #1607388)