Skip to content

Commit 16f7e8f

Browse files
committed
Use locator instead of hardcoded path
1 parent ac1490e commit 16f7e8f

1 file changed

Lines changed: 6 additions & 13 deletions

File tree

app/sprinkles/core/src/ServicesProvider/ServicesProvider.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -689,24 +689,17 @@ public function register(ContainerInterface $container)
689689
* @return \Slim\Views\Twig
690690
*/
691691
$container['view'] = function ($c) {
692-
$templatePaths = $c->locator->findResources('templates://', true, false);
693692

694-
$view = new Twig($templatePaths);
693+
/** @var \UserFrosting\UniformResourceLocator\ResourceLocator $locator */
694+
$locator = $c->locator;
695695

696+
$templatePaths = $locator->getResources('templates://');
697+
$view = new Twig($templatePaths);
696698
$loader = $view->getLoader();
697699

698-
$sprinkles = $c->sprinkleManager->getSprinkleNames();
699-
700700
// Add Sprinkles' templates namespaces
701-
// TODO : Use locator
702-
foreach ($sprinkles as $sprinkle) {
703-
$path = \UserFrosting\APP_DIR . \UserFrosting\DS . \UserFrosting\SPRINKLES_DIR_NAME . \UserFrosting\DS .
704-
$sprinkle . \UserFrosting\DS .
705-
\UserFrosting\TEMPLATE_DIR_NAME . \UserFrosting\DS;
706-
707-
if (is_dir($path)) {
708-
$loader->addPath($path, $sprinkle);
709-
}
701+
foreach (array_reverse($templatePaths) as $templateResource) {
702+
$loader->addPath($templateResource->getAbsolutePath(), $templateResource->getLocation()->getName());
710703
}
711704

712705
$twig = $view->getEnvironment();

0 commit comments

Comments
 (0)