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

Jump to bottom

[BUGFIX] Ensure extension classloader has precedence #827

Merged
merged 1 commit into from Aug 19, 2019
Merged

[BUGFIX] Ensure extension classloader has precedence #827

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Classes/Compatibility/CompatibilityClassLoader.php
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ class CompatibilityClassLoader
public function __construct(ClassLoader $originalClassLoader)
{
$this->originalClassLoader = $this->typo3ClassLoader = $originalClassLoader;
$this->handleExtensionCompatibility();
$this->handleExtensionCompatibility($originalClassLoader);
$this->handleTypo3Compatibility();
}

Expand All @@ -60,7 +60,7 @@ public function getTypo3ClassLoader(): ClassLoader
return $this->typo3ClassLoader;
}

private function handleExtensionCompatibility()
private function handleExtensionCompatibility(ClassLoader $originalClassLoader)
{
if (class_exists(Bootstrap::class)) {
return;
Expand All @@ -69,7 +69,9 @@ private function handleExtensionCompatibility()
putenv('TYPO3_PATH_ROOT=' . $rootPath);
$_ENV['TYPO3_PATH_ROOT'] = $rootPath;
$_SERVER['TYPO3_PATH_ROOT'] = $rootPath;
$originalClassLoader->unregister();
$this->typo3ClassLoader = require $typo3AutoLoadFile;
$originalClassLoader->register(true);
}

private function handleTypo3Compatibility()
Expand Down