update to 1.1.2

switch to phpunit9

2 files changed, 26 insertions, 15 deletions

diff --git a/composer.json b/composer.json
index 9e443d9..0c5d095 100644
--- a/composer.json
+++ b/composer.json
@@ -25,19 +25,19 @@
         "captainhook/captainhook": "^5.3",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "ergebnis/composer-normalize": "^2.6",
-        "fzaninotto/faker": "^1.5",
+        "fakerphp/faker": "^1.5",
         "hamcrest/hamcrest-php": "^2",
-        "jangregor/phpstan-prophecy": "^0.6",
+        "jangregor/phpstan-prophecy": "^0.8",
         "mockery/mockery": "^1.3",
         "phpstan/extension-installer": "^1",
         "phpstan/phpstan": "^0.12.32",
         "phpstan/phpstan-mockery": "^0.12.5",
         "phpstan/phpstan-phpunit": "^0.12.11",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^8.5 || ^9",
         "psy/psysh": "^0.10.4",
         "slevomat/coding-standard": "^6.3",
         "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^3.12.2"
+        "vimeo/psalm": "^4.4"
     },
     "config": {
         "sort-packages": true
@@ -63,7 +63,7 @@
             "@br:analyze:psalm"
         ],
         "br:analyze:phpstan": "phpstan --memory-limit=1G analyse",
-        "br:analyze:psalm": "psalm --diff --diff-methods --config=psalm.xml",
+        "br:analyze:psalm": "psalm --diff --config=psalm.xml",
         "br:build:clean": "git clean -fX build/.",
         "br:build:clear-cache": "git clean -fX build/cache/.",
         "br:lint": "phpcs --cache=build/cache/phpcs.cache",
diff --git a/php-ramsey-collection.spec b/php-ramsey-collection.spec
index 7b7a5ee..fa65eb3 100644
--- a/php-ramsey-collection.spec
+++ b/php-ramsey-collection.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-ramsey-collection
 #
-# Copyright (c) 2020 Remi Collet
+# Copyright (c) 2020-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 %bcond_without tests
 
 # Github
-%global gh_commit    24d93aefb2cd786b7edd9f45b554aea20b28b9b1
+%global gh_commit    a2a85f56ac8f0f973f0e43fcbad5464355bcfe1f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     ramsey
 %global gh_project   collection
@@ -22,7 +22,7 @@
 %global ns_project   Collection
 
 Name:           php-%{pk_vendor}-%{pk_name}
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 Summary:        Library for representing and manipulating collections
 
@@ -41,21 +41,27 @@ BuildRequires:  php-spl
 #        "captainhook/captainhook": "^5.3",
 #        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 #        "ergebnis/composer-normalize": "^2.6",
-#        "fzaninotto/faker": "^1.5",
+#        "fakerphp/faker": "^1.5",
 #        "hamcrest/hamcrest-php": "^2",
-#        "jangregor/phpstan-prophecy": "^0.6",
+#        "jangregor/phpstan-prophecy": "^0.8",,
 #        "mockery/mockery": "^1.3",
 #        "phpstan/extension-installer": "^1",
 #        "phpstan/phpstan": "^0.12.32",
 #        "phpstan/phpstan-mockery": "^0.12.5",
 #        "phpstan/phpstan-phpunit": "^0.12.11",
-#        "phpunit/phpunit": "^8.5",
+#        "phpunit/phpunit": "^8.5 || ^9",
 #        "psy/psysh": "^0.10.4",
 #        "slevomat/coding-standard": "^6.3",
 #        "squizlabs/php_codesniffer": "^3.5",
-#        "vimeo/psalm": "^3.12.2"
+#        "vimeo/psalm": "^4.4"
 %if %{with tests}
+%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+BuildRequires:  phpunit9
+%global phpunit %{_bindir}/phpunit9
+%else
 BuildRequires:  phpunit8 >= 8.5
+%global phpunit %{_bindir}/phpunit8
+%endif
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(fzaninotto/faker)      >= 1.5   with php-composer(fzaninotto/faker)      < 2)
@@ -127,9 +133,10 @@ EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php72 php73 php74 php80; do
-  if which $cmd; then
-   $cmd %{_bindir}/phpunit8 \
+for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+  if which $cmdarg; then
+   set $cmdarg
+   $1 ${2:- %{_bindir}/phpunit9} \
      --no-coverage \
      --verbose || ret=1
   fi
@@ -149,5 +156,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 21 2021 Remi Collet <remi@remirepo.net> - 1.1.2-1
+- update to 1.1.2
+- switch to phpunit9
+
 * Thu Oct  1 2020 Remi Collet <remi@remirepo.net> - 1.1.1-1
 - initial package