Move locator stream registration to core sprinkle

Author: lcharette

app/sprinkles/core/src/Core.php

@@ -33,9 +33,7 @@ public function __construct(ContainerInterface $ci)
     {
         $this->ci = $ci;
 
-        // Register core locator streams
-        $this->ci->locator->registerStream('migrations', '', \UserFrosting\MIGRATIONS_DIR);
-        $this->ci->locator->registerStream('seeds', '', \UserFrosting\SEEDS_DIR);
+        $this->registerStreams();
     }
 
     /**
@@ -114,4 +112,29 @@ public function onAddGlobalMiddleware(Event $event)
     {
         SlimCsrfProvider::registerMiddleware($event->getApp(), $this->ci->request, $this->ci->csrf);
     }
+
+    /**
+     * Register Core sprinkle locator streams
+     */
+    protected function registerStreams()
+    {
+        /** @var \UserFrosting\UniformResourceLocator\ResourceLocator $locator */
+        $locator = $this->ci->locator;
+
+        // Register core locator shared streams
+        $locator->registerStream('cache', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\CACHE_DIR_NAME, true);
+        $locator->registerStream('config', '', \UserFrosting\DS . \UserFrosting\CONFIG_DIR_NAME);
+        $locator->registerStream('log', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\LOG_DIR_NAME, true);
+        $locator->registerStream('migrations', '', \UserFrosting\MIGRATIONS_DIR);
+        $locator->registerStream('seeds', '', \UserFrosting\SEEDS_DIR);
+        $locator->registerStream('session', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\SESSION_DIR_NAME, true);
+
+        // Register core locator sprinkle streams
+        $locator->registerStream('extra', '', \UserFrosting\DS . \UserFrosting\EXTRA_DIR_NAME);
+        $locator->registerStream('factories', '', \UserFrosting\DS . \UserFrosting\FACTORY_DIR_NAME);
+        $locator->registerStream('locale', '', \UserFrosting\DS . \UserFrosting\LOCALE_DIR_NAME);
+        $locator->registerStream('routes', '', \UserFrosting\DS . \UserFrosting\ROUTE_DIR_NAME);
+        $locator->registerStream('schema', '', \UserFrosting\DS . \UserFrosting\SCHEMA_DIR_NAME);
+        $locator->registerStream('templates', '', \UserFrosting\DS . \UserFrosting\TEMPLATE_DIR_NAME);
+    }
 }

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

@@ -152,9 +152,10 @@ public function register(ContainerInterface $container)
                 }
             } else {
 
-                // Register compiled assets stream in public folder + alias for vendor ones
+                // Register compiled assets stream in public folder + alias for vendor ones + build stream for CompiledAssetBundles
                 $c->locator->registerStream('assets', '', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true);
                 $c->locator->registerStream('assets', 'vendor', \UserFrosting\PUBLIC_DIR_NAME . '/' . \UserFrosting\ASSET_DIR_NAME, true);
+                $c->locator->registerStream('build', '', \UserFrosting\BUILD_DIR_NAME, true);
 
                 $baseUrl = $config['site.uri.public'] . '/' . $config['assets.compiled.path'];
                 $assets = new Assets($locator, 'assets', $baseUrl);

app/system/ServicesProvider.php

@@ -48,23 +48,10 @@ public function register(ContainerInterface $container)
         $container['locator'] = function ($c) {
             $locator = new ResourceLocator(\UserFrosting\ROOT_DIR);
 
-            // Register shared streams
+            // Register streams
             $locator->registerStream('bakery', '', \UserFrosting\BAKERY_SYSTEM_DIR, true);
-            $locator->registerStream('build', '', \UserFrosting\BUILD_DIR_NAME, true);
-            $locator->registerStream('log', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\LOG_DIR_NAME, true);
-            $locator->registerStream('cache', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\CACHE_DIR_NAME, true);
-            $locator->registerStream('session', '', \UserFrosting\APP_DIR_NAME . \UserFrosting\DS . \UserFrosting\SESSION_DIR_NAME, true);
-
-            // Register sprinkles streams
-            $locator->registerStream('config', '', \UserFrosting\DS . \UserFrosting\CONFIG_DIR_NAME);
-            $locator->registerStream('extra', '', \UserFrosting\DS . \UserFrosting\EXTRA_DIR_NAME);
-            $locator->registerStream('factories', '', \UserFrosting\DS . \UserFrosting\FACTORY_DIR_NAME);
-            $locator->registerStream('locale', '', \UserFrosting\DS . \UserFrosting\LOCALE_DIR_NAME);
-            $locator->registerStream('routes', '', \UserFrosting\DS . \UserFrosting\ROUTE_DIR_NAME);
-            $locator->registerStream('schema', '', \UserFrosting\DS . \UserFrosting\SCHEMA_DIR_NAME);
-            $locator->registerStream('sprinkles', '', '');
-            $locator->registerStream('templates', '', \UserFrosting\DS . \UserFrosting\TEMPLATE_DIR_NAME);
             $locator->registerStream('bakery', '', \UserFrosting\BAKERY_DIR);
+            $locator->registerStream('sprinkles', '', '');
 
             return $locator;
         };