From b5cc17ff101da61b08755360fea28d68a4860e62 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2024 15:17:44 +0100 Subject: [PATCH 1/2] v4.2.2 (cherry picked from commit 08fbf2bc7276c62355f1733a8f8e33677fcab8f4) --- .gitignore | 1 + php-league-container4.spec | 19 +++++++++---------- sources | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 82dff5f..376992f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-league-container4-4.2.0-375d13cb828649599ef5d48a339c4af7a26cd0ab.tar.gz +/php-league-container4-4.2.2-ff346319ca1ff0e78277dc2311a42107cc1aab88.tar.gz diff --git a/php-league-container4.spec b/php-league-container4.spec index 31d9b5a..3d013c0 100644 --- a/php-league-container4.spec +++ b/php-league-container4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-league-container4 # -# Copyright (c) 2016-2021 Shawn Iwinski +# Copyright (c) 2016-2024 Shawn Iwinski # Remi Collet # # License: MIT @@ -11,8 +11,8 @@ %global github_owner thephpleague %global github_name container -%global github_version 4.2.0 -%global github_commit 375d13cb828649599ef5d48a339c4af7a26cd0ab +%global github_version 4.2.2 +%global github_commit ff346319ca1ff0e78277dc2311a42107cc1aab88 %global major 4 @@ -32,7 +32,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A fast and intuitive dependency injection container version %{major} License: MIT @@ -124,13 +124,9 @@ 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 php74 php80 php81; do +for PHP_EXEC in php php81 php82 php83; do if which $PHP_EXEC; then - FILTER="" - VER=$($PHP_EXEC -r 'echo PHP_VERSION_ID;') - if [ $VER -ge 80100 ]; then - FILTER="--filter '^((?!(testResolverResolvesArgumentsViaReflection|testResolverThrowsExceptionWhenReflectionDoesNotResolve)).)*\$'" - fi + FILTER="--filter '^((?!(testResolverResolvesArgumentsViaReflection|testResolverThrowsExceptionWhenReflectionDoesNotResolve)).)*\$'" $PHP_EXEC $PHPUNIT $FILTER \ --bootstrap bootstrap.php \ --verbose || RETURN_CODE=1 @@ -153,6 +149,9 @@ exit $RETURN_CODE %changelog +* Wed Mar 13 2024 Remi Collet - 4.2.2-1 +- update to 4.2.2 + * Fri Jul 21 2023 Fedora Release Engineering - 4.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index b0acf6a..fef98bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-container4-4.2.0-375d13cb828649599ef5d48a339c4af7a26cd0ab.tar.gz) = ae0ed148d80404a8cc23c22bbdc1f47e4a7268e5160f19d125bca07ecbdf098ebb334726daba3557252168933f5db3e2c79f82c4dea1d67976829832185da73c +SHA512 (php-league-container4-4.2.2-ff346319ca1ff0e78277dc2311a42107cc1aab88.tar.gz) = cf72cec021efbc9c3bef723ee715b43a5f78fe22874bf39f573a021b857e2c318a75f461ddff3149da36b64e5a703d2884a6a188be31e88a5acbc431a618cc08 From c02c472c5d6a9a69e109605bf9498e428e270d41 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 09:56:36 +0100 Subject: [PATCH 2/2] v4.2.4 (cherry picked from commit 3fe96d3bade494b1b13a02fd8001623fc6d1f8ec) (cherry picked from commit 5efc36204b975a08dec66388b5f21d908b20004c) --- .gitignore | 2 ++ php-league-container4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 376992f..f0e6bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /php-league-container4-4.2.0-375d13cb828649599ef5d48a339c4af7a26cd0ab.tar.gz /php-league-container4-4.2.2-ff346319ca1ff0e78277dc2311a42107cc1aab88.tar.gz +/php-league-container4-4.2.3-72f9bebe7bd623007782a40f5ec305661ab706d8.tar.gz +/php-league-container4-4.2.4-7ea728b013b9a156c409c6f0fc3624071b742dec.tar.gz diff --git a/php-league-container4.spec b/php-league-container4.spec index 3d013c0..3e458b3 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.2.2 -%global github_commit ff346319ca1ff0e78277dc2311a42107cc1aab88 +%global github_version 4.2.4 +%global github_commit 7ea728b013b9a156c409c6f0fc3624071b742dec %global major 4 @@ -124,7 +124,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 php81 php82 php83; do +for PHP_EXEC in php php81 php82 php83 php84; do if which $PHP_EXEC; then FILTER="--filter '^((?!(testResolverResolvesArgumentsViaReflection|testResolverThrowsExceptionWhenReflectionDoesNotResolve)).)*\$'" $PHP_EXEC $PHPUNIT $FILTER \ @@ -149,6 +149,9 @@ exit $RETURN_CODE %changelog +* Tue Nov 12 2024 Remi Collet - 4.2.4-1 +- update to 4.2.4 + * Wed Mar 13 2024 Remi Collet - 4.2.2-1 - update to 4.2.2 diff --git a/sources b/sources index fef98bf..f017916 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-league-container4-4.2.2-ff346319ca1ff0e78277dc2311a42107cc1aab88.tar.gz) = cf72cec021efbc9c3bef723ee715b43a5f78fe22874bf39f573a021b857e2c318a75f461ddff3149da36b64e5a703d2884a6a188be31e88a5acbc431a618cc08 +SHA512 (php-league-container4-4.2.4-7ea728b013b9a156c409c6f0fc3624071b742dec.tar.gz) = d5c1eab89f63eff564232166d65577f4713b8de84741ad4bfe34855d196868564ef61c3f4ba00596ca4a22fd2ab903f950b3adb53cec7cbd325990602fccdce8