[FOLLOWUP][FEATURE] Extract dependency ordering out of DependencyResolver 29/40729/2
authorBenjamin Mack <benni@typo3.org>
Mon, 29 Jun 2015 17:06:49 +0000 (19:06 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 29 Jun 2015 20:02:58 +0000 (22:02 +0200)
The dependency order resolver needs to be injected at runtime.

Resolves: #67293
Releases: master
Change-Id: Id7f2b65b0258e22081d326f06d3d13f874bea1ff
Reviewed-on: http://review.typo3.org/40729
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Classes/Core/Bootstrap.php

index 129205e..b88a205 100644 (file)
@@ -397,7 +397,9 @@ class Bootstrap {
                $this->setEarlyInstance(\TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
                Utility\ExtensionManagementUtility::setPackageManager($packageManager);
                $packageManager->injectCoreCache($this->getEarlyInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_core'));
-               $packageManager->injectDependencyResolver(Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Package\DependencyResolver::class));
+               $dependencyResolver = Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Package\DependencyResolver::class);
+               $dependencyResolver->injectDependencyOrderingService(Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Service\DependencyOrderingService::class));
+               $packageManager->injectDependencyResolver($dependencyResolver);
                $packageManager->initialize($this);
                Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Package\PackageManager::class, $packageManager);
                return $this;