diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-mock-phpunit2.spec | 25 |
2 files changed, 20 insertions, 8 deletions
diff --git a/composer.json b/composer.json index 406f8cb..ef911d4 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,9 @@ "phpunit/phpunit": "^6 || ^7 || ^8 || ^9", "php-mock/php-mock-integration": "^2.1" }, + "require-dev": { + "phpspec/prophecy": "^1.10.3" + }, "archive": { "exclude": ["/tests"] } diff --git a/php-mock-phpunit2.spec b/php-mock-phpunit2.spec index 9bf82f8..63a384a 100644 --- a/php-mock-phpunit2.spec +++ b/php-mock-phpunit2.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-mock-phpunit2 # -# Copyright (c) 2016-2021 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 2877a0e58f12e91b64bf36ccd080a209dcbf6c30 +%global gh_commit b9ba2db21e7e1c7deba98bc86dcfc6425fb4647d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner php-mock %global gh_project php-mock-phpunit @@ -14,8 +14,8 @@ %global major 2 Name: php-mock-phpunit%{major} -Version: 2.6.0 -Release: 4%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Summary: Mock built-in PHP functions with PHPUnit. License: WTFPL @@ -27,12 +27,16 @@ BuildRequires: php(language) >= 7 %if %{with_tests} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(php-mock/php-mock-integration) >= 2.1 with php-composer(php-mock/php-mock-integration) < 3) -BuildRequires: (php-composer(php-mock/php-mock) >= 2.2 with php-composer(php-mock/php-mock) < 3) -# remirepo:4 +BuildRequires: (php-composer(php-mock/php-mock-integration) >= 2.1 with php-composer(php-mock/php-mock-integration) < 3) +BuildRequires: (php-composer(php-mock/php-mock) >= 2.2 with php-composer(php-mock/php-mock) < 3) +# From composer.json "require-dev": { +# "phpspec/prophecy": "^1.10.3" +BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) +# remirepo:5 %else BuildRequires: php-mock-integration2 >= 2.1 BuildRequires: php-mock2 >= 2.2 +BuildRequires: php-phpspec-prophecy >= 1.10.3 %endif %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8 BuildRequires: phpunit8 @@ -114,6 +118,7 @@ cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{_datadir}/php/phpmock%{major}/phpunit/autoload.php'; require_once '%{_datadir}/php/phpmock%{major}/autoload.php'; +require_once '%{_datadir}/php/Prophecy/autoload.php'; EOF ret=0 @@ -146,7 +151,7 @@ fi if [ -x %{_bindir}/phpunit9 ]; then : Run upstream test suite with phpunit9 -for cmd in php php73 php74 php80; do +for cmd in php php73 php74 php80 php81 php82; do if which $cmd; then $cmd %{_bindir}/phpunit9 --verbose || ret=1 fi @@ -168,6 +173,10 @@ exit $ret %changelog +* Mon Sep 12 2022 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- update to 2.6.1 +- add dependency on phpspec/prophecy + * Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 2.6.0-4 - drop dependency on phpunit6 |