[5.4] Refactoring mix method (bis).

src/Illuminate/Foundation/helpers.php

@@ -522,41 +522,10 @@ function method_field($method)
      * @param  string  $path
      * @param  string  $manifestDirectory
      * @return \Illuminate\Support\HtmlString
-     *
-     * @throws \Exception
      */
     function mix($path, $manifestDirectory = '')
     {
-        static $manifest;
-
-        if (! starts_with($path, '/')) {
-            $path = "/{$path}";
-        }
-
-        if ($manifestDirectory && ! starts_with($manifestDirectory, '/')) {
-            $manifestDirectory = "/{$manifestDirectory}";
-        }
-
-        if (file_exists(public_path($manifestDirectory.'/hot'))) {
-            return new HtmlString("//localhost:8080{$path}");
-        }
-
-        if (! $manifest) {
-            if (! file_exists($manifestPath = public_path($manifestDirectory.'/mix-manifest.json'))) {
-                throw new Exception('The Mix manifest does not exist.');
-            }
-
-            $manifest = json_decode(file_get_contents($manifestPath), true);
-        }
-
-        if (! array_key_exists($path, $manifest)) {
-            throw new Exception(
-                "Unable to locate Mix file: {$path}. Please check your ".
-                'webpack.mix.js output paths and try again.'
-            );
-        }
-
-        return new HtmlString($manifestDirectory.$manifest[$path]);
+        return app('mix')->mix($path, $manifestDirectory);
     }
 }
 

src/Illuminate/View/Mix/Mix.php

@@ -0,0 +1,271 @@
+<?php
+
+namespace Illuminate\View\Mix;
+
+use Illuminate\Support\Str;
+use Illuminate\Support\HtmlString;
+
+class Mix
+{
+    /**
+     * The sanitized path to the asset.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * The cached manifest.
+     *
+     * @var array
+     */
+    protected $manifest;
+
+    /**
+     * The directory where the assets and the manifest file are.
+     *
+     * @var string
+     */
+    protected $manifestDirectory;
+
+    /**
+     * The cache of mix state.
+     *
+     * @var bool
+     */
+    protected $disabled = false;
+
+    /**
+     * The URI of HMR server.
+     *
+     * @var string
+     */
+    protected $hmrURI = '//localhost:8080';
+
+    /**
+     * The name of file which prove that HMR is enabled.
+     *
+     * @var string
+     */
+    protected $hmrFilename = '/hot';
+
+    /**
+     * The name of Mix Manifest file.
+     *
+     * @var string
+     */
+    protected $manifestFilename = '/mix-manifest.json';
+
+    /**
+     * Get the path to a versioned Mix asset or a simple message if mix is disabled.
+     *
+     * @param  string  $path
+     * @param  string  $manifestDirectory
+     * @return \Illuminate\Support\HtmlString
+     */
+    public function mix($path, $manifestDirectory = '')
+    {
+        if ($this->disabled) {
+            return $this->disabledPath();
+        }
+
+        return $this->getRealPath($path, $manifestDirectory);
+    }
+
+    /**
+     * Get the path to a versioned Mix file.
+     *
+     * @param  string  $path
+     * @param  string  $manifestDirectory
+     * @return \Illuminate\Support\HtmlString
+     */
+    protected function getRealPath($path, $manifestDirectory)
+    {
+        $this->init($path, $manifestDirectory);
+
+        if ($this->hmrModeEnabled()) {
+            return $this->hmrPath();
+        }
+
+        return $this->compiledPath();
+    }
+
+    /**
+     * Set a sanitized version of assets.
+     *
+     * @param  string  $path
+     * @param  string  $manifestDirectory
+     * @return void
+     */
+    protected function init($path, $manifestDirectory)
+    {
+        $this->path = $this->sanitize($path);
+        $this->manifestDirectory = $this->sanitize($manifestDirectory);
+    }
+
+    /**
+     * Get a sanitized version of a path.
+     *
+     * @param  string  $path
+     * @return string
+     */
+    protected function sanitize($path)
+    {
+        if ($path && ! Str::startsWith($path, '/')) {
+            $path = "/{$path}";
+        }
+
+        return $path;
+    }
+
+    /**
+     * Check if the HRM mode of Mix is enabled.
+     *
+     * @return bool
+     */
+    protected function hmrModeEnabled()
+    {
+        return file_exists(public_path($this->manifestDirectory.$this->hmrFilename));
+    }
+
+    /**
+     * Get the full path to the file through the HMR server.
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    protected function hmrPath()
+    {
+        return new HtmlString($this->hmrURI.$this->path);
+    }
+
+    /**
+     * Get the full path to the compiled file.
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    protected function compiledPath()
+    {
+        return new HtmlString($this->manifestDirectory.$this->getPathFromManifest());
+    }
+
+    /**
+     * Get a message instead of the path when mix is disabled.
+     *
+     * @return \Illuminate\Support\HtmlString
+     */
+    protected function disabledPath()
+    {
+        return new HtmlString('Mix is disabled!');
+    }
+
+    /**
+     * Get the path from the manifest file.
+     *
+     * @return string
+     *
+     * @throws \Illuminate\View\Mix\MixException
+     */
+    protected function getPathFromManifest()
+    {
+        if (! array_key_exists($this->path, $manifest = $this->getManifest())) {
+            throw new MixException(
+                "Unable to locate Mix file: {$this->path}. Please check your ".
+                'webpack.mix.js output paths and try again.'
+            );
+        }
+
+        return $manifest[$this->path];
+    }
+
+    /**
+     * Load the manifest file.
+     *
+     * @return array
+     *
+     * @throws \Illuminate\View\Mix\MixException
+     */
+    protected function getManifest()
+    {
+        if (! $this->manifest) {
+            if (! file_exists($manifestPath = public_path($this->manifestDirectory.$this->manifestFilename))) {
+                throw new MixException('The Mix manifest does not exist.');
+            }
+
+            $this->manifest = json_decode(file_get_contents($manifestPath), true);
+
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                throw new MixException('The Mix manifest isn\'t a proper json file.');
+            }
+        }
+
+        return $this->manifest;
+    }
+
+    /**
+     * Disable the mix function (in case of tests for example).
+     *
+     * @param  bool  $disabled
+     * @return $this
+     */
+    public function disable($disabled = true)
+    {
+        $this->disabled = $disabled;
+
+        return $this;
+    }
+
+    /**
+     * Enable the mix function (in case of it was disabled before).
+     *
+     * @param  bool  $enabled
+     * @return $this
+     */
+    public function enable($enabled = true)
+    {
+        $this->disabled = ! $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Set the URI of HMR sever.
+     *
+     * @param  string  $hmrURI
+     *
+     * @return $this
+     */
+    public function setHmrURI($hmrURI)
+    {
+        $this->hmrURI = $hmrURI;
+
+        return $this;
+    }
+
+    /**
+     * Set the Mix Manifest filename.
+     *
+     * @param  string  $manifestFilename
+     *
+     * @return Mix
+     */
+    public function setManifestFilename($manifestFilename)
+    {
+        $this->manifestFilename = $this->sanitize($manifestFilename);
+
+        return $this;
+    }
+
+    /**
+     * Set the HMR hot filename.
+     *
+     * @param  string  $hmrFilename
+     *
+     * @return Mix
+     */
+    public function setHmrFilename($hmrFilename)
+    {
+        $this->hmrFilename = $this->sanitize($hmrFilename);
+
+        return $this;
+    }
+}

src/Illuminate/View/Mix/MixException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Illuminate\View\Mix;
+
+use Exception;
+
+class MixException extends Exception
+{
+    //
+}

src/Illuminate/View/ViewServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\View;
 
+use Illuminate\View\Mix\Mix;
 use Illuminate\View\Engines\PhpEngine;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Engines\FileEngine;
@@ -23,6 +24,8 @@ public function register()
         $this->registerViewFinder();
 
         $this->registerEngineResolver();
+
+        $this->registerMix();
     }
 
     /**
@@ -133,4 +136,16 @@ public function registerBladeEngine($resolver)
             return new CompilerEngine($this->app['blade.compiler']);
         });
     }
+
+    /**
+     * Register the Mix instance.
+     *
+     * @return void
+     */
+    public function registerMix()
+    {
+        $this->app->singleton('mix', function () {
+            return new Mix;
+        });
+    }
 }

tests/Foundation/FoundationHelpersTest.php

@@ -56,4 +56,14 @@ public function testUnversionedElixir()
 
         unlink(public_path($file));
     }
+
+    public function testMixMethod()
+    {
+        app()->instance(
+            'mix',
+            m::mock(\Illuminate\View\Mix\Mix::class)->shouldReceive('mix')->andReturn('bar')->getMock()
+        );
+
+        $this->assertSame('bar', mix('foo'));
+    }
 }