diff options
| -rw-r--r-- | composer.json | 12 | ||||
| -rw-r--r-- | php-doctrine-deprecations.spec | 50 |
2 files changed, 24 insertions, 38 deletions
diff --git a/composer.json b/composer.json index f8319f9..a7a51e3 100644 --- a/composer.json +++ b/composer.json @@ -8,20 +8,18 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "1.4.10 || 2.0.3", + "phpstan/phpstan-phpunit": "^1.0 || ^2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" }, "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "autoload-dev": { diff --git a/php-doctrine-deprecations.spec b/php-doctrine-deprecations.spec index 8e6022d..e092532 100644 --- a/php-doctrine-deprecations.spec +++ b/php-doctrine-deprecations.spec @@ -1,15 +1,15 @@ # remirepo/fedora spec file for php-doctrine-deprecations # -# Copyright (c) 2021-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2021-2024 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -%global gh_commit dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab +%global gh_commit 31610dbb31faa98e6b5447b62340826f54fbc4e9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project deprecations @@ -21,7 +21,7 @@ %global ns_project Deprecations Name: php-%{pk_vendor}-%{pk_project} -Version: 1.1.3 +Version: 1.1.4 Release: 1%{?dist} Summary: A small layer on top of triggeFr_error or PSR-3 logging @@ -36,20 +36,12 @@ BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json # "require-dev": { -# "doctrine/coding-standard": "^9", -# "phpstan/phpstan": "1.4.10 || 1.10.15", -# "phpstan/phpstan-phpunit": "^1.0", +# "doctrine/coding-standard": "^9 || ^12", +# "phpstan/phpstan": "1.4.10 || 2.0.3", +# "phpstan/phpstan-phpunit": "^1.0 || ^2", # "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", -# "psalm/plugin-phpunit": "0.18.4", -# "psr/log": "^1 || ^2 || ^3", -# "vimeo/psalm": "4.30.0 || 5.12.0" -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +# "psr/log": "^1 || ^2 || ^3" BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) -# remirepo:3 -%else -BuildRequires: php-PsrLog -%endif BuildRequires: phpunit9 >= 9.5 %endif @@ -60,13 +52,7 @@ BuildRequires: phpunit9 >= 9.5 # "psr/log": "Allows logging deprecations via PSR-3 logger implementation" Requires: php(language) >= 7.1 -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) -# remirepo:3 -%else -Requires: php-PsrLog -%endif # From phpcompatinfo report for version 0.5.3 # Only core and standard @@ -100,11 +86,11 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %build : Generate a simple autoloader %{_bindir}/phpab \ - --output lib/%{ns_vendor}/%{ns_project}/autoload.php \ + --output src/autoload.php \ --template fedora \ - lib/%{ns_vendor} + src -cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php +cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ [ @@ -117,8 +103,8 @@ EOF %install -mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} -cp -pr lib/%{ns_vendor}/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} +mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} +cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} %check @@ -138,7 +124,7 @@ cat << 'EOF' | tee -a vendor/autoload.php EOF ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd -d auto_prepend_file=vendor/autoload.php \ %{_bindir}/phpunit9 \ @@ -154,8 +140,6 @@ exit $ret %files -# remirepo:1 -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json @@ -163,6 +147,10 @@ exit $ret %changelog +* Mon Dec 9 2024 Remi Collet <remi@remirepo.net> - 1.1.4-1 +- update to 1.1.4 +- re-license spec file to CECILL-2.1 + * Wed Jan 31 2024 Remi Collet <remi@remirepo.net> - 1.1.3-1 - update to 1.1.3 (no change) - Fix FTBFS #2261475 |