From 871021bc857b126e11a29ffacda556fbd293d128 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Feb 2021 09:20:00 +0100 Subject: [PATCH 1/4] update to 1.8.0 raise dependency on PHP 7.3 switch to phpunit9 (cherry picked from commit 9c47e02cb89992e0bce9958ce5d733c65b4715d6) --- php-myclabs-php-enum.spec | 29 +++++++++++++++++------------ sources | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 47a4cc6..c0ea814 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-myclabs-php-enum # -# Copyright (c) 2017-2020 Remi Collet +# Copyright (c) 2017-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit d178027d1e679832db9f38248fcc7200647dc2b7 +%global gh_commit 46cf3d8498b095bd33727b13fd5707263af99421 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.7.7 +Version: 1.8.0 Release: 1%{?dist} Summary: PHP Enum implementation @@ -33,24 +33,24 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 7.1 +BuildRequires: php(language) >= 7.3 BuildRequires: php-reflection BuildRequires: php-json BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^7", +# "phpunit/phpunit": "^9.5", # "squizlabs/php_codesniffer": "1.*" -# "vimeo/psalm": "^3.8" -%global phpunit %{_bindir}/phpunit7 -BuildRequires: %{phpunit} +# "vimeo/psalm": "^4.5.1" +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 >= 9.5 # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=7.1", +# "php": "^7.3 || ^8.0", # "ext-json": "*" -Requires: php(language) >= 7.1 +Requires: php(language) >= 7.3 Requires: php-json # From phpcompatinfo report for version 1.6.1 Requires: php-reflection @@ -99,10 +99,10 @@ require __DIR__ . '/bootstrap.php'; EOF ret=0 -for cmd in "php %{phpunit}" php72 php73 php74 php80; do +for cmd in "php %{phpunit}" php73 php74 php80; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit6} --verbose --bootstrap tests/autoload.php || ret=1 + $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap tests/autoload.php || ret=1 fi done exit $ret @@ -121,6 +121,11 @@ exit $ret %changelog +* Tue Feb 16 2021 Remi Collet - 1.8.0-1 +- update to 1.8.0 +- raise dependency on PHP 7.3 +- switch to phpunit9 + * Mon Nov 16 2020 Remi Collet - 1.7.7-1 - update to 1.7.7 diff --git a/sources b/sources index bf028ea..46b7e6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.7.7-d178027.tgz) = de2562f5e2f9d295a8f06e7fcdb0ff844192fb1e3e947c35e54be88c33f19c2f6a8a190cbda52dd47029cdbcbdd541ee0f285214ceaeca58a3ebf231f37a991c +SHA512 (php-myclabs-php-enum-1.8.0-46cf3d8.tgz) = aad18b76a99f30c0dc5e669040740f55bdd8475d2a175264ceb5974ea6e037e802a7c0723400e623e7070df58e2c34c6a1c2ae9743c12dcb0038d44e21c99517 From 172906795668ceee75838d364ce717fbf651b94d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Jun 2021 14:35:31 +0200 Subject: [PATCH 2/4] v1.8.1 (cherry picked from commit 14d14d0a38697cd4e5b41c1c555735c653a534a4) --- php-myclabs-php-enum.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index c0ea814..1cd517a 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 46cf3d8498b095bd33727b13fd5707263af99421 +%global gh_commit 55555d31a622b4bc9662664132a0533ae6ef47b1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} Summary: PHP Enum implementation @@ -40,7 +40,7 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^9.5", # "squizlabs/php_codesniffer": "1.*" -# "vimeo/psalm": "^4.5.1" +# "vimeo/psalm": "^4.6.2" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.5 # Required by autoloader @@ -99,7 +99,7 @@ require __DIR__ . '/bootstrap.php'; EOF ret=0 -for cmd in "php %{phpunit}" php73 php74 php80; do +for cmd in "php %{phpunit}" php73 php74 php80 php81; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap tests/autoload.php || ret=1 @@ -121,6 +121,9 @@ exit $ret %changelog +* Tue Jun 29 2021 Remi Collet - 1.8.1-1 +- update to 1.8.1 + * Tue Feb 16 2021 Remi Collet - 1.8.0-1 - update to 1.8.0 - raise dependency on PHP 7.3 diff --git a/sources b/sources index 46b7e6c..f557444 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.8.0-46cf3d8.tgz) = aad18b76a99f30c0dc5e669040740f55bdd8475d2a175264ceb5974ea6e037e802a7c0723400e623e7070df58e2c34c6a1c2ae9743c12dcb0038d44e21c99517 +SHA512 (php-myclabs-php-enum-1.8.1-55555d3.tgz) = c9b5f06a4806484d1c3b9e07c82922829eea306d2f4f56b69ae21ef0da542f08e7c6d7d6d328116af32b534c5f68c88e0fbe24441c8da4c9be66b8ee5b663cd5 From 31ef8542752f441eba95d463951f0cf1b00b0892 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jul 2021 08:30:51 +0200 Subject: [PATCH 3/4] v1.8.2 (cherry picked from commit 01cd194a70fcb090e2ba3fbbc17b9aad699f4ea8) --- php-myclabs-php-enum.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 1cd517a..6392815 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 55555d31a622b4bc9662664132a0533ae6ef47b1 +%global gh_commit 8bef486e885cae67ced6e43257300e8acc3f06ad %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.1 +Version: 1.8.2 Release: 1%{?dist} Summary: PHP Enum implementation @@ -121,6 +121,9 @@ exit $ret %changelog +* Mon Jul 5 2021 Remi Collet - 1.8.2-1 +- update to 1.8.2 + * Tue Jun 29 2021 Remi Collet - 1.8.1-1 - update to 1.8.1 diff --git a/sources b/sources index f557444..2f8b0f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.8.1-55555d3.tgz) = c9b5f06a4806484d1c3b9e07c82922829eea306d2f4f56b69ae21ef0da542f08e7c6d7d6d328116af32b534c5f68c88e0fbe24441c8da4c9be66b8ee5b663cd5 +SHA512 (php-myclabs-php-enum-1.8.2-8bef486.tgz) = 81755efa8ed3b1e62f7d3b3ca5261fde8a0c75a2c89cd03c222b69bec0d2fc36c54ed9ffee3232475c35a82a09648de737213671cd43e41850c81f32f04b290a From e488fe1169ecacdca8958cc9d67a42e9764db691 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jul 2021 11:37:54 +0200 Subject: [PATCH 4/4] v1.8.3 (cherry picked from commit 4824e351537e9daaf8986412ced50b5f88e2ccde) --- php-myclabs-php-enum.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec index 6392815..563099e 100644 --- a/php-myclabs-php-enum.spec +++ b/php-myclabs-php-enum.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 8bef486e885cae67ced6e43257300e8acc3f06ad +%global gh_commit b942d263c641ddb5190929ff840c68f78713e937 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner myclabs %global gh_project php-enum @@ -20,7 +20,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 1.8.2 +Version: 1.8.3 Release: 1%{?dist} Summary: PHP Enum implementation @@ -121,6 +121,9 @@ exit $ret %changelog +* Mon Jul 5 2021 Remi Collet - 1.8.3-1 +- update to 1.8.3 + * Mon Jul 5 2021 Remi Collet - 1.8.2-1 - update to 1.8.2 diff --git a/sources b/sources index 2f8b0f2..e99c5c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-myclabs-php-enum-1.8.2-8bef486.tgz) = 81755efa8ed3b1e62f7d3b3ca5261fde8a0c75a2c89cd03c222b69bec0d2fc36c54ed9ffee3232475c35a82a09648de737213671cd43e41850c81f32f04b290a +SHA512 (php-myclabs-php-enum-1.8.3-b942d26.tgz) = 0aa384a587f8150ec56299043968a42bc0cac2c85204976bd57d9f0650d849458ec906ffa6568ed76f369bfadc81f06f2399cf3e1ad9dfdd3e673d71527186ef