diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpunit-FinderFacade.spec | 29 |
2 files changed, 22 insertions, 9 deletions
diff --git a/composer.json b/composer.json index 645bc26..ba282a5 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ }, "require": { "theseer/fdomdocument": "~1.3", - "symfony/finder": "~2.3|~3.0" + "symfony/finder": "~2.3|~3.0|~4.0" }, "autoload": { "classmap": [ diff --git a/php-phpunit-FinderFacade.spec b/php-phpunit-FinderFacade.spec index f00fbc0..3cdcd04 100644 --- a/php-phpunit-FinderFacade.spec +++ b/php-phpunit-FinderFacade.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9 +%global gh_commit 4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project finder-facade @@ -16,8 +16,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} Name: php-phpunit-FinderFacade -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: Wrapper for Symfony Finder component Group: Development/Libraries @@ -32,17 +32,25 @@ BuildRequires: php-fedora-autoloader-devel BuildRequires: %{_bindir}/phpunit BuildRequires: php-composer(theseer/fdomdocument) < 2 BuildRequires: php-composer(theseer/fdomdocument) >= 1.3 +%if 0%{?fedora} >= 26 +BuildRequires: php-composer(symfony/finder) < 5 +%else BuildRequires: php-composer(symfony/finder) < 4 +%endif BuildRequires: php-composer(symfony/finder) >= 2.3 %endif # From composer.json "require": { # "theseer/fdomdocument": "~1.3", -# "symfony/finder": "~2.3|~3.0" +# "symfony/finder": "~2.3|~3.0|~4.0" Requires: php(language) >= 5.3.3 Requires: php-composer(theseer/fdomdocument) < 2 Requires: php-composer(theseer/fdomdocument) >= 1.3 +%if 0%{?fedora} >= 26 +Requires: php-composer(symfony/finder) < 5 +%else Requires: php-composer(symfony/finder) < 4 +%endif Requires: php-composer(symfony/finder) >= 2.3 # From phpcompatinfo report for version 1.2.1 Requires: php-ctype @@ -72,6 +80,7 @@ cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required(array( '%{php_home}/TheSeer/fDOMDocument/autoload.php', array( + '%{php_home}/Symfony4/Component/Finder/autoload.php', '%{php_home}/Symfony3/Component/Finder/autoload.php', '%{php_home}/Symfony/Component/Finder/autoload.php', ), @@ -88,14 +97,14 @@ cp -pr src %{buildroot}%{php_home}/SebastianBergmann/FinderFacade %check php -r 'require "%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php";' +ret=0 for cmd in php php56 php70 php71 php72; do if which $cmd; then - $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \ - %{_bindir}/phpunit \ - --bootstrap %{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php \ - --verbose tests + $cmd -d auto_prepend_file=%{buildroot}%{php_home}/SebastianBergmann/FinderFacade/autoload.php \ + %{_bindir}/phpunit --verbose tests || ret=1 fi done +exit $ret %endif @@ -116,6 +125,10 @@ fi %changelog +* Sun Nov 19 2017 Remi Collet <remi@remirepo.net> - 1.2.2-1 +- Update to 1.2.2 +- allow Symfony 4 + * Tue May 9 2017 Remi Collet <remi@fedoraproject.org> - 1.2.1-3 - switch to fedora/autoloader |