summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-02-24 09:50:52 +0100
committerRemi Collet <remi@remirepo.net>2020-02-24 09:50:52 +0100
commit49e2067b131c60708bdde277d952df04e385d68d (patch)
tree0204752ac50c2a4de209a53edb40dfd0a077d4e6
parentee41f93e213a05cf590f4408f10accffeaf47478 (diff)
sync with Fedora
-rw-r--r--php-ocramius-proxy-manager.spec16
1 files changed, 12 insertions, 4 deletions
diff --git a/php-ocramius-proxy-manager.spec b/php-ocramius-proxy-manager.spec
index 3d6520f..3473e75 100644
--- a/php-ocramius-proxy-manager.spec
+++ b/php-ocramius-proxy-manager.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-ocramius-proxy-manager
#
-# Copyright (c) 2015-2019 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -32,7 +32,7 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 3%{?github_release}%{?dist}
Summary: OOP proxy wrappers utilities
License: MIT
@@ -150,10 +150,15 @@ cat << 'EOF' | tee -a vendor/autoload.php
require_once '%{buildroot}%{phpdir}/ProxyManager/autoload.php';
EOF
+: Zend => Laminas
+if [ -d /usr/share/php/Laminas ]
+then sed -i "s/'Zend/'Laminas/" \
+ tests/ProxyManagerTest/ProxyGenerator/RemoteObject/MethodGenerator/RemoteObjectMethodTest.php
+fi
+
: Run tests
-# TODO 7.4
RETURN_CODE=0
-for PHP_EXEC in php php72 php73; do
+for PHP_EXEC in php php72 php73 php74; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit6 --verbose \
|| RETURN_CODE=1
@@ -175,6 +180,9 @@ exit $RETURN_CODE
%changelog
+* Sun Feb 23 2020 Shawn Iwinski <shawn.iwinski@gmail.com> - 2.2.2-3
+- Fix FTBFS (RHDB #1799874)
+
* Thu Aug 29 2019 Remi Collet <remi@remirepo.net> - 2.2.2-1
- update to 2.2.2
- use zendframework component autoloaders instead of framework one