blob: 37e0e16c8ff44562c209e07d37c0b2e23cc7819e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff --git a/bin/doctrine.php b/bin/doctrine.php
index 842c5493f..e1ccb7506 100755
--- a/bin/doctrine.php
+++ b/bin/doctrine.php
@@ -1,3 +1,4 @@
+#!/usr/bin/env php
<?php
/*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -20,17 +21,7 @@
use Symfony\Component\Console\Helper\HelperSet;
use Doctrine\ORM\Tools\Console\ConsoleRunner;
-$autoloadFiles = [
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php'
-];
-
-foreach ($autoloadFiles as $autoloadFile) {
- if (file_exists($autoloadFile)) {
- require_once $autoloadFile;
- break;
- }
-}
+require_once '__PHPDIR__/Doctrine/ORM/autoload.php';
$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'];
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
@@ -43,7 +43,7 @@ class SetupTest extends OrmTestCase
public function testDirectoryAutoload()
{
- Setup::registerAutoloadDirectory(__DIR__ . "/../../../../../vendor/doctrine/common/lib");
+ Setup::registerAutoloadDirectory("/usr/share/php");
$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);
|
