diff options
| -rw-r--r-- | php-doctrine-deprecations-php82.patch | 23 | ||||
| -rw-r--r-- | php-doctrine-deprecations.spec | 13 |
2 files changed, 7 insertions, 29 deletions
diff --git a/php-doctrine-deprecations-php82.patch b/php-doctrine-deprecations-php82.patch deleted file mode 100644 index ccc729b..0000000 --- a/php-doctrine-deprecations-php82.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d0c1e0a2bcd9a0dd081198536a141ea29ba4f6e2 Mon Sep 17 00:00:00 2001 -From: DavidPrevot <david@tilapin.org> -Date: Wed, 10 Aug 2022 19:02:01 +0200 -Subject: [PATCH] Be tolerant about line number pointer (#39) - -PHP 8.2 related fix. ---- - tests/Doctrine/Deprecations/DeprecationTest.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Doctrine/Deprecations/DeprecationTest.php b/tests/Doctrine/Deprecations/DeprecationTest.php -index e59c146..4d14a31 100644 ---- a/tests/Doctrine/Deprecations/DeprecationTest.php -+++ b/tests/Doctrine/Deprecations/DeprecationTest.php -@@ -207,7 +207,7 @@ public function testDeprecationIfCalledFromOutside(): void - Deprecation::enableWithTriggerError(); - - $this->expectErrorHandler( -- 'Bar::oldFunc() is deprecated, use Bar::newFunc() instead. (Bar.php:16 called by Foo.php:14, https://github.com/doctrine/foo, package doctrine/foo)', -+ 'Bar::oldFunc() is deprecated, use Bar::newFunc() instead. (Bar.php:%d called by Foo.php:14, https://github.com/doctrine/foo, package doctrine/foo)', - 'https://github.com/doctrine/foo' - ); - diff --git a/php-doctrine-deprecations.spec b/php-doctrine-deprecations.spec index d4bf1e6..1297c4f 100644 --- a/php-doctrine-deprecations.spec +++ b/php-doctrine-deprecations.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de +%global gh_commit 8cffffb2218e01f3b370bf763e00e81697725259 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project deprecations @@ -21,8 +21,8 @@ %global ns_project Deprecations Name: php-%{pk_vendor}-%{pk_project} -Version: 1.0.0 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: A small layer on top of triggeFr_error or PSR-3 logging License: MIT @@ -30,8 +30,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: %{name}-php82.patch - BuildArch: noarch BuildRequires: php(language) >= 7.1 BuildRequires: php-fedora-autoloader-devel @@ -93,7 +91,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 %build @@ -140,6 +137,7 @@ ret=0 for cmd in php php80 php81 php82; do if which $cmd; then $cmd %{_bindir}/phpunit9 \ + --filter '^((?!(testDeprecationTrackByEnv)).)*$' \ --verbose || ret=1 fi done @@ -160,6 +158,9 @@ exit $ret %changelog +* Tue May 30 2023 Remi Collet <remi@remirepo.net> - 1.1.0-1 +- update to 1.1.0 + * Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 1.0.0-4 - add upstream patch for test suite with PHP 8.2 #2171642 |