From 0b11efdd74ba1bd7d3eeee0c9df280eb45ddf6ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Jul 2023 13:46:18 +0200 Subject: update to 1.6.3 --- php-mockery.spec | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'php-mockery.spec') diff --git a/php-mockery.spec b/php-mockery.spec index e201e6b..7b5d369 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -9,7 +9,7 @@ # %bcond_without tests -%global gh_commit 13a7fa2642c76c58fa2806ef7f565344c817a191 +%global gh_commit b1be135c1ba7632f0248e07ee5e6e412576a309d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner mockery %global gh_project mockery @@ -17,7 +17,7 @@ %global major 1 Name: php-mockery -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} Summary: Mockery is a simple but flexible PHP mock object framework @@ -34,8 +34,8 @@ BuildArch: noarch BuildRequires: php(language) >= 7.4 # From composer.json, "require-dev": { # "phpunit/phpunit": "^8.5|^9.3", -# "psalm/plugin-phpunit": "^0.18", -# "vimeo/psalm": "^5.9" +# "psalm/plugin-phpunit": "^0.18.4", +# "vimeo/psalm": "^5.13.1" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.3 # remirepo:1 @@ -51,7 +51,7 @@ BuildRequires: php-pdo BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.4 || ^8.0", +# "php": ">=7.4,<8.3", # "lib-pcre": ">=7.0", # "hamcrest/hamcrest-php": "~2.0" Requires: php(language) >= 7.3 @@ -83,10 +83,10 @@ Autoloader: %{_datadir}/php/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -mv library/*.php library/%{ns_project}/ -phpab --template fedora --output library/%{ns_project}/autoload.php library +mv src/*.php src/%{ns_project}/ +phpab --template fedora --output src/%{ns_project}/autoload.php src -cat << 'EOF' | tee -a library/%{ns_project}/autoload.php +cat << 'EOF' | tee -a src/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ '/usr/share/php/Hamcrest2/autoload.php', @@ -105,7 +105,7 @@ rm -f docs/.gitignore %install mkdir -p %{buildroot}/%{_datadir}/php -cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} +cp -rp src/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} %check @@ -113,7 +113,7 @@ cp -rp library/%{ns_project} %{buildroot}/%{_datadir}/php/%{ns_project}%{major} : Use installed tree and our autoloader export COMPOSER_VENDOR_DIR=%{buildroot}%{_datadir}/php/%{ns_project}%{major} -phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery +phpab --output tests/classmap.php --exclude */SemiReservedWordsAsMethods.php tests/Mockery tests/Fixture : Run upstream test suite ret=0 @@ -142,6 +142,9 @@ exit $ret %changelog +* Wed Jul 19 2023 Remi Collet - 1.6.3-1 +- update to 1.6.3 + * Thu Jun 8 2023 Remi Collet - 1.6.2-1 - update to 1.6.2 -- cgit