diff options
Diffstat (limited to 'php-doctrine-orm-bin.patch')
| -rw-r--r-- | php-doctrine-orm-bin.patch | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/php-doctrine-orm-bin.patch b/php-doctrine-orm-bin.patch index 77992f0..37e0e16 100644 --- a/php-doctrine-orm-bin.patch +++ b/php-doctrine-orm-bin.patch @@ -29,7 +29,7 @@ index 842c5493f..e1ccb7506 100755 diff -up a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm 2019-09-30 08:35:50.547638239 +0200 +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php 2019-09-30 08:37:02.769360851 +0200 -@@ -45,7 +45,7 @@ class SetupTest extends OrmTestCase +@@ -43,7 +43,7 @@ class SetupTest extends OrmTestCase public function testDirectoryAutoload() { @@ -39,3 +39,19 @@ diff -up a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php.rpm b/tests/Doctrine/Tes $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions())); } +diff -up ./lib/Doctrine/ORM/Tools/Setup.php.rpm ./lib/Doctrine/ORM/Tools/Setup.php +--- ./lib/Doctrine/ORM/Tools/Setup.php.rpm 2020-05-27 11:28:24.144920624 +0200 ++++ ./lib/Doctrine/ORM/Tools/Setup.php 2020-05-27 11:29:14.330733814 +0200 +@@ -45,7 +45,11 @@ 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/Common3/ClassLoader.php")) { ++ require_once $directory . "/Doctrine/Common3/ClassLoader.php"; ++ } else { ++ require_once $directory . "/Doctrine/Common/ClassLoader.php"; ++ } + } + + $loader = new ClassLoader("Doctrine", $directory); |