[10.x] Rework Application public path methods (#46015)

* Add usePublicPath helper to Application to match other path helpers

* Use new usePublicPath method in tests

* Sort paths alphabetically in bindPathsInContainer

Author: jnoordsij

src/Illuminate/Foundation/Application.php

@@ -131,6 +131,13 @@ class Application extends Container implements ApplicationContract, CachesConfig
      */
     protected $langPath;
 
+    /**
+     * The custom public / web path defined by the developer.
+     *
+     * @var string
+     */
+    protected $publicPath;
+
     /**
      * The custom storage path defined by the developer.
      *
@@ -324,11 +331,10 @@ protected function bindPathsInContainer()
         $this->instance('path', $this->path());
         $this->instance('path.base', $this->basePath());
         $this->instance('path.config', $this->configPath());
-        $this->instance('path.public', $this->publicPath());
-        $this->instance('path.storage', $this->storagePath());
         $this->instance('path.database', $this->databasePath());
+        $this->instance('path.public', $this->publicPath());
         $this->instance('path.resources', $this->resourcePath());
-        $this->instance('path.bootstrap', $this->bootstrapPath());
+        $this->instance('path.storage', $this->storagePath());
 
         $this->useBootstrapPath(value(function () {
             return is_dir($directory = $this->basePath('.laravel'))
@@ -481,11 +487,26 @@ public function useLangPath($path)
      */
     public function publicPath($path = '')
     {
-        $publicPath = $this->bound('path.public') ? $this->make('path.public') : $this->basePath('public');
+        $publicPath = $this->publicPath ?: $this->basePath('public');
 
         return $this->joinPaths($publicPath, $path);
     }
 
+    /**
+     * Set the public / web directory.
+     *
+     * @param  string  $path
+     * @return $this
+     */
+    public function usePublicPath($path)
+    {
+        $this->publicPath = $path;
+
+        $this->instance('path.public', $path);
+
+        return $this;
+    }
+
     /**
      * Get the path to the storage directory.
      *

tests/Foundation/FoundationHelpersTest.php

@@ -205,9 +205,7 @@ public function testMixHotModuleReloadingWithManifestDirectoryUsesLocalhostIfNoH
 
     protected function makeHotModuleReloadFile($url, $directory = '')
     {
-        app()->singleton('path.public', function () {
-            return __DIR__;
-        });
+        app()->usePublicPath(__DIR__);
 
         $path = public_path(Str::finish($directory, '/').'hot');
 
@@ -220,9 +218,7 @@ protected function makeHotModuleReloadFile($url, $directory = '')
 
     protected function makeManifest($directory = '')
     {
-        app()->singleton('path.public', function () {
-            return __DIR__;
-        });
+        app()->usePublicPath(__DIR__);
 
         $path = public_path(Str::finish($directory, '/').'mix-manifest.json');
 

tests/Foundation/FoundationViteTest.php

@@ -1108,7 +1108,7 @@ public function testCrossoriginAttributeIsInheritedByPreloadTags()
     public function testItCanConfigureTheManifestFilename()
     {
         $buildDir = Str::random();
-        app()->singleton('path.public', fn () => __DIR__);
+        app()->usePublicPath(__DIR__);
         if (! file_exists(public_path($buildDir))) {
             mkdir(public_path($buildDir));
         }
@@ -1186,7 +1186,7 @@ public function testItOnlyOutputsUniquePreloadTags()
 
     protected function makeViteManifest($contents = null, $path = 'build')
     {
-        app()->singleton('path.public', fn () => __DIR__);
+        app()->usePublicPath(__DIR__);
 
         if (! file_exists(public_path($path))) {
             mkdir(public_path($path));
@@ -1247,7 +1247,7 @@ protected function cleanViteManifest($path = 'build')
 
     protected function makeViteHotFile($path = null)
     {
-        app()->singleton('path.public', fn () => __DIR__);
+        app()->usePublicPath(__DIR__);
 
         $path ??= public_path('hot');
 

tests/Integration/Foundation/FoundationHelpersTest.php

@@ -117,9 +117,7 @@ public function testMixOnlyThrowsAndReportsOneExceptionWhenAssetIsMissingFromMan
 
     protected function makeManifest($directory = '')
     {
-        $this->app->singleton('path.public', function () {
-            return __DIR__;
-        });
+        app()->usePublicPath(__DIR__);
 
         $path = public_path(Str::finish($directory, '/').'mix-manifest.json');