v3.2.2 from Fedora

3 files changed, 33 insertions, 25 deletions

diff --git a/composer.json b/composer.json
index 8ce66c3..224c00c 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
         }
     ],
     "require": {
-        "php": "^5.4.0 || ^7.0",
-        "container-interop/container-interop": "^1.2"
+        "php": "^7.0",
+        "psr/container": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "4.*"
+        "phpunit/phpunit" : "^6.0",
+        "squizlabs/php_codesniffer": "^3.3"
     },
     "provide": {
-        "container-interop/container-interop-implementation": "^1.2",
         "psr/container-implementation": "^1.0"
     },
     "replace": {
@@ -46,6 +46,7 @@
     },
     "extra": {
         "branch-alias": {
+            "dev-3.x": "3.x-dev",
             "dev-2.x": "2.x-dev",
             "dev-1.x": "1.x-dev"
         }
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..d187140
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-league-container-get-source.sh
\ No newline at end of file
diff --git a/php-league-container.spec b/php-league-container.spec
index b4b85e1..3fa4acc 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-2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2016-2019 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   2.4.1
-%global github_commit    43f35abd03a12977a60ffd7095efd6a7808488c0
+%global github_version   3.2.2
+%global github_commit    fa38155fa392ad2ed05fb6418e9d9d58064c7e76
 
 %global composer_vendor  league
 %global composer_project container
 
-# "php": "^5.4.0 || ^7.0"
-%global php_min_ver 5.4.0
-# "container-interop/container-interop": "^1.2"
-%global container_interop_min_ver 1.2
-%global container_interop_max_ver 2.0
+# "php": "^7.0"
+%global php_min_ver 7.0
+# "psr/container": "^1.0"
+%global psr_container_min_ver 1.0
+%global psr_container_max_ver 2.0
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -34,7 +34,6 @@ Version:       %{github_version}
 Release:       1%{?github_release}%{?dist}
 Summary:       A fast and intuitive dependency injection container
 
-Group:         Development/Libraries
 License:       MIT
 URL:           http://container.thephpleague.com/
 
@@ -49,8 +48,13 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
-BuildRequires: php-composer(container-interop/container-interop) >= %{container_interop_min_ver}
-## phpcompatinfo (computed from version 2.4.1)
+%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
+BuildRequires: php-composer(psr/container) >= %{psr_container_min_ver}
+BuildRequires: php-composer(psr/container) <  %{psr_container_max_ver}
+%endif
+## phpcompatinfo (computed from version 3.2.2)
 BuildRequires: php-reflection
 BuildRequires: php-spl
 ## Autoloader
@@ -59,9 +63,13 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
-Requires:      php-composer(container-interop/container-interop) >= %{container_interop_min_ver}
-Requires:      php-composer(container-interop/container-interop) <  %{container_interop_max_ver}
-# phpcompatinfo (computed from version 2.4.1)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(psr/container) >= %{psr_container_min_ver} with php-composer(psr/container) < %{psr_container_max_ver})
+%else
+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)
 Requires:      php-reflection
 Requires:      php-spl
 # Autoloader
@@ -69,7 +77,6 @@ Requires:      php-composer(fedora/autoloader)
 
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
-Provides:      php-composer(container-interop/container-interop-implementation) = %{container_interop_min_ver}
 Provides:      php-composer(psr/container-implementation) =  1.0
 
 %description
@@ -96,7 +103,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('League\\Container\\', __DIR__);
 
 \Fedora\Autoloader\Dependencies::required(array(
-    '%{phpdir}/Interop/Container/autoload.php',
+    '%{phpdir}/Psr/Container/autoload.php',
 ));
 AUTOLOAD
 
@@ -115,14 +122,10 @@ require '%{buildroot}%{phpdir}/League/Container/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('League\\Container\\Test\\', __DIR__.'/tests');
 BOOTSTRAP
 
-: Skip test known to fail
-sed 's/function testCallReflectsOnStaticMethodArguments/function SKIP_testCallReflectsOnStaticMethodArguments/' \
-    -i tests/ReflectionContainerTest.php
-
 : Upstream tests
 RETURN_CODE=0
 PHPUNIT=$(which phpunit)
-for PHP_EXEC in php %{?rhel:php55} php56 php70 php71 php72; do
+for PHP_EXEC in php php71 php72 php73 php74; do
     if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then
         $PHP_EXEC $PHPUNIT --bootstrap bootstrap.php --verbose || RETURN_CODE=1
     fi
@@ -145,6 +148,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Sun Jun 16 2019 Shawn Iwinski <shawn@iwin.ski> - 3.2.2-1
+- Update to 3.2.2 (RHBZ #1607388)
+
 * Sun Aug 20 2017 Shawn Iwinski <shawn@iwin.ski> - 2.4.1-1
 - Update to 2.4.1
 - Switch autoloader to fedora/autoloader