summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2024-03-13 08:36:52 +0100
committerRemi Collet <remi@php.net>2024-03-13 08:36:52 +0100
commitc85255892751a9eb5910e2d7d235d65081c27a36 (patch)
tree7a7a14c3a00baad3bf5056e9b3b4dc75352caf23
parent909d4ff53fd487259a32fed7837bd9b2db1c41c0 (diff)
update to 1.6.9 (revert to 1.6.7 code)
-rw-r--r--composer.json4
-rw-r--r--php-mockery.spec13
2 files changed, 10 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index ca84c58..f23d2de 100644
--- a/composer.json
+++ b/composer.json
@@ -49,8 +49,8 @@
"hamcrest/hamcrest-php": "^2.0.1"
},
"require-dev": {
- "phpunit/phpunit": "^8.5 || ^9.6.17",
- "symplify/easy-coding-standard": "^12.1.14"
+ "phpunit/phpunit": "^8.5 || ^9.6.10",
+ "symplify/easy-coding-standard": "^12.0.8"
},
"conflict": {
"phpunit/phpunit": "<8.0"
diff --git a/php-mockery.spec b/php-mockery.spec
index 37feace..4207fa0 100644
--- a/php-mockery.spec
+++ b/php-mockery.spec
@@ -9,7 +9,7 @@
#
%bcond_without tests
-%global gh_commit 415720b7e3052f42de05c384134387771d3e183b
+%global gh_commit 0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner mockery
%global gh_project mockery
@@ -17,7 +17,7 @@
%global major 1
Name: php-mockery
-Version: 1.6.8
+Version: 1.6.9
Release: 1%{?dist}
Summary: Mockery is a simple but flexible PHP mock object framework
@@ -33,10 +33,10 @@ BuildArch: noarch
%if %{with tests}
BuildRequires: php(language) >= 7.3
# From composer.json, "require-dev": {
-# "phpunit/phpunit": "^8.5 || ^9.6.17",
-# "symplify/easy-coding-standard": "^12.1.14"
+# "phpunit/phpunit": "^8.5 || ^9.6.10",
+# "symplify/easy-coding-standard": "^12.0.8"
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.6.17
+BuildRequires: phpunit9 >= 9.6.10
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3)
@@ -141,6 +141,9 @@ exit $ret
%changelog
+* Wed Mar 13 2024 Remi Collet <remi@remirepo.net> - 1.6.9-1
+- update to 1.6.9 (revert to 1.6.7 code)
+
* Tue Mar 12 2024 Remi Collet <remi@remirepo.net> - 1.6.8-1
- update to 1.6.8