From 0a4fdf15517b112bd3cfa4d264a2e0ce1248b942 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 23 Sep 2022 11:36:50 +0200
Subject: update to 2.13.2

---
 php-doctrine-orm-bin.patch | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'php-doctrine-orm-bin.patch')

diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch
index 13d55fb..94fae70 100644
--- a/php-doctrine-orm-bin.patch
+++ b/php-doctrine-orm-bin.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/doctrine.php.rpm1 ./bin/doctrine.php
---- ./bin/doctrine.php.rpm1	2022-04-20 08:53:37.075738715 +0200
-+++ ./bin/doctrine.php	2022-04-20 08:55:11.484503176 +0200
+--- ./bin/doctrine.php.rpm1	2022-09-23 11:23:08.000000000 +0200
++++ ./bin/doctrine.php	2022-09-23 11:30:54.541647836 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env php
  <?php
@@ -26,24 +26,22 @@ diff -up ./bin/doctrine.php.rpm1 ./bin/doctrine.php
  $directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
  
 diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm1 ./lib/Doctrine/ORM/Tools/Setup.php
---- ./lib/Doctrine/ORM/Tools/Setup.php.rpm1	2022-04-20 08:49:16.000000000 +0200
-+++ ./lib/Doctrine/ORM/Tools/Setup.php	2022-04-20 08:53:37.075738715 +0200
-@@ -52,7 +52,11 @@ class Setup
+--- ./lib/Doctrine/ORM/Tools/Setup.php.rpm1	2022-09-23 11:30:54.542647834 +0200
++++ ./lib/Doctrine/ORM/Tools/Setup.php	2022-09-23 11:32:10.791505590 +0200
+@@ -54,7 +54,9 @@ class Setup
      public static function registerAutoloadDirectory($directory)
      {
          if (! class_exists('Doctrine\Common\ClassLoader', false)) {
--            require_once $directory . '/Doctrine/Common/ClassLoader.php';
+-            if (file_exists($directory . '/Doctrine/Common/ClassLoader.php')) {
 +            if (file_exists($directory . "/Doctrine/Common3/ClassLoader.php")) {
 +                require_once $directory . "/Doctrine/Common3/ClassLoader.php";
-+            } else {
-+                require_once $directory . "/Doctrine/Common/ClassLoader.php";
-+            }
-         }
- 
-         $loader = new ClassLoader('Doctrine', $directory);
++            } elseif (file_exists($directory . '/Doctrine/Common/ClassLoader.php')) {
+                 require_once $directory . '/Doctrine/Common/ClassLoader.php';
+             } elseif (file_exists(dirname($directory) . '/src/ClassLoader.php')) {
+                 require_once dirname($directory) . '/src/ClassLoader.php';
 diff -up ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1 ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php
---- ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1	2022-04-20 08:49:16.000000000 +0200
-+++ ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php	2022-04-20 08:53:37.075738715 +0200
+--- ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm1	2022-09-23 11:23:08.000000000 +0200
++++ ./tests/Doctrine/Tests/ORM/Tools/SetupTest.php	2022-09-23 11:30:54.542647834 +0200
 @@ -54,7 +54,7 @@ class SetupTest extends TestCase
  
      public function testDirectoryAutoload(): void
-- 
cgit