From c6aff61658a2aba1321e4abee3c753a6b951d92e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 3 Mar 2022 14:02:19 +0100
Subject: [PATCH] v1.4.1

(cherry picked from commit cf83f09549f19dcb2f053960f60cc0d294c5f8f1)
---
 .gitignore                     |  1 +
 php-doctrine-instantiator.spec | 24 +++++++++++++-----------
 sources                        |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1141e21..ed1b6b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /php-doctrine-instantiator-1.3.0-ae466f7.tgz
 /php-doctrine-instantiator-1.3.1-f350df0.tgz
 /php-doctrine-instantiator-1.4.0-d56bf61.tgz
+/php-doctrine-instantiator-1.4.1-10dcfce.tgz
diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec
index 8042a98..9b057eb 100644
--- a/php-doctrine-instantiator.spec
+++ b/php-doctrine-instantiator.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-doctrine-instantiator
 #
-# Copyright (c) 2014-2020 Remi Collet
+# Copyright (c) 2014-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -9,7 +9,7 @@
 
 # bootstrap needed when rebuilding PHPUnit for new major version
 %global bootstrap    0
-%global gh_commit    d56bf6102915de5702778fe20f2de3b2fe570b5b
+%global gh_commit    10dcfce151b967d20fde1b34ae6640712c3891bc
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   instantiator
@@ -21,8 +21,8 @@
 %endif
 
 Name:           php-doctrine-instantiator
-Version:        1.4.0
-Release:        2%{?dist}
+Version:        1.4.1
+Release:        1%{?dist}
 Summary:        Instantiate objects in PHP without invoking their constructors
 
 License:        MIT
@@ -38,11 +38,7 @@ BuildRequires:  php-phar
 BuildRequires:  php-pdo
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
-%if 0%{?fedora} >=31 || 0%{?rhel} >= 9
 %global phpunit %{_bindir}/phpunit9
-%else
-%global phpunit %{_bindir}/phpunit8
-%endif
 BuildRequires:  %{phpunit}
 %endif
 
@@ -92,14 +88,17 @@ mkdir vendor
     tests
 cat << 'EOF' | tee -a vendor/autoload.php
 require "%{buildroot}%{_datadir}/php/Doctrine/Instantiator/autoload.php";
+Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorPerformance\\', dirname(__DIR__).'/tests');
+Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTest\\', dirname(__DIR__).'/tests');
+Fedora\Autoloader\Autoload::addPsr0('DoctrineTest\\InstantiatorTestAsset\\', dirname(__DIR__).'/tests');
 EOF
 
 : Run test suite
 ret=0
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
   if which $cmdarg; then
     set $cmdarg
-    $1 -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \
+    $1 -d auto_prepend_file=vendor/autoload.php \
       ${2:-%{_bindir}/phpunit9} \
         --verbose || ret=1
   fi
@@ -118,6 +117,9 @@ exit $ret
 
 
 %changelog
+* Thu Mar  3 2022 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- update to 1.4.1
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
@@ -183,4 +185,4 @@ exit $ret
 - update to 1.0.3
 
 * Mon Aug 25 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
-- initial package, version 1.0.2
\ No newline at end of file
+- initial package, version 1.0.2
diff --git a/sources b/sources
index d4da5f2..44415b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-doctrine-instantiator-1.4.0-d56bf61.tgz) = 76d6a0f4c07ca85271f21b675ba867fd3b17862e7f1ae351bb8f917a8f2ac5c66d5e3b6372535d41884680440fa8a4d0ad9a0d3fc34628a8220d360968da7ed9
+SHA512 (php-doctrine-instantiator-1.4.1-10dcfce.tgz) = a05a1b58cca70030f85a1fdfc7403dea074aff5164545da398754cc66b488764e3ad455288463ec28663e5c92610b878d1d82c0c8e4b93c2119d55e8a7957069