Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX backport Conflict with autoload to 18.0 #30399

Merged
merged 1 commit into from
Jul 17, 2024
Merged

FIX backport Conflict with autoload to 18.0 #30399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 41 additions & 12 deletions htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ private function loadLastResort($className, $loader = null)
return $this->loadThisLoader($className, $loader);
}
foreach ($loaders as $loader)
if (false !== $file = $this->loadThisLoader($className, $loader))
return $file;
if (false !== $file = $this->loadThisLoader($className, $loader))
return $file;

return false;
}
Expand All @@ -285,23 +285,52 @@ private function loadLastResort($className, $loader = null)
*/
private function loadThisLoader($className, $loader)
{
if (is_array($loader)
&& is_callable($loader)) {
$b = new $loader[0];
//avoid PHP Fatal error: Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
//in case of multiple autoloader systems
if (property_exists($b, $loader[1])) {
if (false !== $file = $b::$loader[1]($className)
&& $this->exists($className, $b::$loader[1])) {
return $file;
}
}
} elseif (is_callable($loader)
&& false !== $file = $loader($className)
&& $this->exists($className, $loader)) {
return $file;
}
return false;

/* other code tested to reduce autoload conflict
$s = '';
if (is_array($loader)
&& is_callable($loader)) {
// @CHANGE DOL avoid autoload conflict
if (!preg_match('/LuraCast/', get_class($loader[0]))) {
return false;
}
$b = new $loader[0];
//avoid PHP Fatal error: Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
// @CHANGE DOL avoid PHP Fatal error: Uncaught Error: Access to undeclared static property: Composer\\Autoload\\ClassLoader::$loader
//in case of multiple autoloader systems
if (property_exists($b, $loader[1])) {
if (false !== $file = $b::$loader[1]($className)
&& $this->exists($className, $b::$loader[1])) {
return $file;
}
&& $this->exists($className, $b::$loader[1])) {
return $file;
}
}
} elseif (is_callable($loader, false, $s)) {
// @CHANGE DOL avoid PHP infinite loop (detected when xdebug is on)
if ($s == 'Luracast\Restler\AutoLoader::__invoke') {
return false;
}
if (false !== ($file = $loader($className)) && $this->exists($className, $loader)) {
return $file;
}
} elseif (is_callable($loader)
&& false !== $file = $loader($className)
&& $this->exists($className, $loader)) {
return $file;
}
return false;
*/
}

/**
Expand Down Expand Up @@ -417,7 +446,7 @@ public function __invoke($className)
if (false !== $includeReference = $this->discover($className))
return $includeReference;

static::thereCanBeOnlyOne();
//static::thereCanBeOnlyOne();

if (false !== $includeReference = $this->loadAliases($className))
return $includeReference;
Expand All @@ -426,7 +455,7 @@ public function __invoke($className)
return $includeReference;

if (false !== $includeReference = $this->loadLastResort($className))
return $includeReference;
return $includeReference;

static::seen($className, true);
return null;
Expand Down
Loading