From 1e3ec07288735e4ff9af6c3132564cba38225fcb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Feb 2020 16:56:58 +0100 Subject: fix compatibility with Symfony 4 using patch from https://github.com/llaville/php-reflect/pull/37 --- php-bartlett-PHP-Reflect.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'php-bartlett-PHP-Reflect.spec') diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec index 63e06b5..71f7776 100644 --- a/php-bartlett-PHP-Reflect.spec +++ b/php-bartlett-PHP-Reflect.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-bartlett-PHP-Reflect # -# Copyright (c) 2011-2017 Remi Collet +# Copyright (c) 2011-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -29,7 +29,7 @@ Name: php-bartlett-PHP-Reflect Version: 4.3.0 -%global specrel 2 +%global specrel 3 Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} Summary: Adds the ability to reverse-engineer PHP @@ -42,6 +42,8 @@ Source1: %{name}-autoload.php # Enable cache plugin Patch0: %{name}-4.3.0-rpm.patch +# Fix compatibility with Symfony 4 +Patch1: https://patch-diff.githubusercontent.com/raw/llaville/php-reflect/pull/37.patch BuildArch: noarch BuildRequires: php(language) >= 5.5 @@ -184,6 +186,7 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p1 -b .rpm find . -name \*.rpm -delete -print cp %{SOURCE1} src/Bartlett/Reflect/autoload.php @@ -208,7 +211,7 @@ install -D -p -m 644 bin/phpreflect.1 %{buildroot}%{_mandir}/man1/phpref %check %if %{with_tests} ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit" php71 php72 php73; do +for cmdarg in "php %{phpunit}" php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} \ @@ -240,6 +243,10 @@ fi %changelog +* Tue Feb 25 2020 Remi Collet - 4.3.0-3 +- fix compatibility with Symfony 4 using patch from + https://github.com/llaville/php-reflect/pull/37 + * Sun Dec 9 2018 Remi Collet - 4.3.0-2 - Fedora: switch to symfony4 only, see #1657328 -- cgit