diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-fedora-autoloader.spec | 35 |
2 files changed, 26 insertions, 12 deletions
diff --git a/composer.json b/composer.json index c7cfd3d..501302f 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", - "phpdocumentor/phpdocumentor": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.0.5", + "phpunit/phpunit": "^4.8.35 || ^5.7.11 || ^6.0.5 || ^7 || ^8", "theseer/autoload": "^1.22" }, "autoload": { diff --git a/php-fedora-autoloader.spec b/php-fedora-autoloader.spec index 9a82263..472bb78 100644 --- a/php-fedora-autoloader.spec +++ b/php-fedora-autoloader.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-fedora-autoloader # -# Copyright (c) 2016-2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski> # Remi Collet <remi@fedoraproject.org> # # License: MIT @@ -13,8 +13,8 @@ %global github_owner php-fedora %global github_name autoloader -%global github_version 1.0.0 -%global github_commit 6075ef68a27dbd9d94a583c2da08a1ae02347a12 +%global github_version 1.0.1 +%global github_commit 7cd61b5a927c8f446df8e820aa288434e18a7f0c %global composer_vendor fedora %global composer_project autoloader @@ -33,10 +33,9 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?dist} +Release: 2%{?dist} Summary: Fedora Autoloader -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz @@ -55,14 +54,14 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: %{phpunit} BuildRequires: php-composer(theseer/autoload) >= %{phpab_min_ver} BuildRequires: php-pear -## phpcompatinfo (computed from version 1.0.0) +## phpcompatinfo (computed from version 1.0.1) BuildRequires: php-ctype BuildRequires: php-spl %endif # composer.json Requires: php(language) >= %{php_min_ver} -# phpcompatinfo (computed from version 1.0.0) +# phpcompatinfo (computed from version 1.0.1) Requires: php-ctype Requires: php-spl @@ -82,7 +81,6 @@ required and optional dependencies. %package devel Summary: %{name} devel -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: php-composer(theseer/autoload) >= %{phpab_min_ver} @@ -122,13 +120,24 @@ cp -p res/phpab/fedora*.php.tpl %{buildroot}%{phpab_template_dir}/ %check %if %{with_tests} +: Create tests bootstrap +cat <<'BOOTSTRAP' | tee bootstrap.php +<?php +require '%{buildroot}%{phpdir}/Fedora/Autoloader/autoload.php'; + +if (!class_exists('PHPUnit\\Framework\\TestCase')) { + class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\\Framework\\TestCase'); +} +BOOTSTRAP + +: Upstream tests RETURN_CODE=0 -for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55 php56} php70 "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6" "php73 %{_bindir}/phpunit6"; do +for PHP_EXEC in "php %{phpunit}" %{?rhel:php54 php55 php56} php70 "php71 %{_bindir}/phpunit6" "php72 %{_bindir}/phpunit6" "php73 %{_bindir}/phpunit6" "php74 %{_bindir}/phpunit6"; do set $PHP_EXEC if [ "php" == "$1" ] || which $PHP_EXEC; then $1 -d include_path=.:%{buildroot}%{phpdir}:%{phpdir}:%{_datadir}/pear \ ${2:-%{_bindir}/phpunit} \ - --bootstrap %{buildroot}%{phpdir}/Fedora/Autoloader/autoload.php \ + --bootstrap bootstrap.php \ --verbose fi done @@ -151,6 +160,12 @@ exit $RETURN_CODE %changelog +* Wed Feb 12 2020 Shawn Iwinski <shawn@iwin.ski> - 1.0.1-2 +- Add tests bootstrap to fix EPEL6 build + +* Wed Feb 12 2020 Shawn Iwinski <shawn@iwin.ski> - 1.0.1-1 +- Update to 1.0.1 (RHBZ #1802372) + * Tue Dec 4 2018 Remi Collet <remi@remirepo.net> - 1.0.0-5 - cleanup for EL-8 |