summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-06 08:23:30 +0200
committerRemi Collet <remi@remirepo.net>2019-06-06 08:23:30 +0200
commitceb88eabcbda3c62be989713ab10ffad3a5fef6d (patch)
treecebf2f8fd5b6731a92da7fbde97afc567218dcb4
parent01fd562ec0c0c6fee06565fcb5f77f0693b6db3b (diff)
-rw-r--r--composer.json4
-rw-r--r--php-mock2.spec12
2 files changed, 13 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 3d34f6b..5500e4e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,9 @@
"autoload": {
"psr-4": {
"phpmock\\": ["classes/", "tests/"]
- },
+ }
+ },
+ "autoload-dev": {
"files": ["autoload.php"]
},
"require": {
diff --git a/php-mock2.spec b/php-mock2.spec
index cf59153..fd20d39 100644
--- a/php-mock2.spec
+++ b/php-mock2.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit e2eea560cb01502148ca895221f0b58806c5a4df
+%global gh_commit 35379d7b382b787215617f124662d9ead72c15e3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner php-mock
%global gh_project php-mock
@@ -14,7 +14,7 @@
%global major 2
Name: php-mock%{major}
-Version: 2.1.1
+Version: 2.1.2
Release: 1%{?dist}
Summary: PHP-Mock can mock built-in PHP functions
@@ -102,6 +102,9 @@ grep -v '<?php' autoload.php >>rpm/php/phpmock%{major}/autoload.php
ln -s ../../php/phpmock%{major}/autoload.php rpm/tests/phpmock%{major}/autoload.php
+: Fix autoloader path
+sed -e 's:../autoload.php:autoload.php:' \
+ -i rpm/tests/phpmock2/AbstractMockTest.php&
%build
@@ -118,6 +121,8 @@ cp -pr rpm/tests %{buildroot}%{_datadir}/tests
%check
%if %{with_tests}
# TODO: local build fails, build in mock is ok
+# TODO: php 7.4: There was 1 failure:
+# see https://github.com/php-mock/php-mock/issues/28
ret=0
for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" "php72 %{_bindir}/phpunit8" "php73 %{_bindir}/phpunit8"; do
if which $cmdarg; then
@@ -141,6 +146,9 @@ exit $ret
%changelog
+* Thu Jun 6 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
+- update to 2.1.2
+
* Mon Apr 8 2019 Remi Collet <remi@remirepo.net> - 2.1.1-1
- update to 2.1.1