diff --git a/.gitignore b/.gitignore index 17b202b..91db77d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-mockery-1.5.1-e92dcc8.tgz /php-mockery-1.6.1-a8dd186.tgz /php-mockery-1.6.2-13a7fa2.tgz +/php-mockery-1.6.3-b1be135.tgz diff --git a/php-mockery.spec b/php-mockery.spec index 8920fba..dc6415b 100644 --- a/php-mockery.spec +++ b/php-mockery.spec @@ -8,7 +8,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 @@ -16,7 +16,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 @@ -33,8 +33,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 BuildRequires: (php-composer(hamcrest/hamcrest-php) >= 2.0.1 with php-composer(hamcrest/hamcrest-php) < 3) @@ -44,7 +44,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 @@ -70,10 +70,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', @@ -92,7 +92,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 @@ -100,7 +100,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 @@ -128,6 +128,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 diff --git a/sources b/sources index bca3a76..06a0855 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-mockery-1.6.2-13a7fa2.tgz) = 007969a96d4e2cdd88f889e6d207c0747835bad8728a4daced7361dd91309cfc4ef8e80cf7ce5662e504d5f12be5146e8e54e3d406a5204d930749abbbf5b185 +SHA512 (php-mockery-1.6.3-b1be135.tgz) = b9b210774f40b50c2508f51e935b465c0db3f959dcbbdb808f52e0369d18d97a06fa116e44c4fc715c378c5fe9fe4d704ae0e57dd0e388c01f25351d91f7b674