summaryrefslogtreecommitdiffstats
path: root/php-doctrine-orm-bin.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-09-23 11:36:50 +0200
committerRemi Collet <remi@php.net>2022-09-23 11:36:50 +0200
commit0a4fdf15517b112bd3cfa4d264a2e0ce1248b942 (patch)
tree0834087d0e6cd42d83340c663a789db26cf22b10 /php-doctrine-orm-bin.patch
parent57e138533948eab5fd67f08b3ef50d3632fc6a46 (diff)
update to 2.13.2HEADmaster
Diffstat (limited to 'php-doctrine-orm-bin.patch')
-rw-r--r--php-doctrine-orm-bin.patch26
1 files changed, 12 insertions, 14 deletions
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