formatting

Author: taylorotwell

src/Illuminate/View/Engines/CompilerEngine.php

@@ -26,13 +26,14 @@ class CompilerEngine extends PhpEngine
     /**
      * Create a new compiler engine instance.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $filesystem
      * @param  \Illuminate\View\Compilers\CompilerInterface  $compiler
+     * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(Filesystem $filesystem, CompilerInterface $compiler)
+    public function __construct(CompilerInterface $compiler, Filesystem $files)
     {
-        parent::__construct($filesystem);
+        parent::__construct($files);
+
         $this->compiler = $compiler;
     }
 

src/Illuminate/View/Engines/FileEngine.php

@@ -12,17 +12,17 @@ class FileEngine implements Engine
      *
      * @var \Illuminate\Filesystem\Filesystem
      */
-    protected $filesystem;
+    protected $files;
 
     /**
      * Create a new file engine instance.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $filesystem
+     * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(Filesystem $filesystem)
+    public function __construct(Filesystem $files)
     {
-        $this->filesystem = $filesystem;
+        $this->files = $files;
     }
 
     /**
@@ -34,6 +34,6 @@ public function __construct(Filesystem $filesystem)
      */
     public function get($path, array $data = [])
     {
-        return $this->filesystem->get($path);
+        return $this->files->get($path);
     }
 }

src/Illuminate/View/Engines/PhpEngine.php

@@ -13,17 +13,17 @@ class PhpEngine implements Engine
      *
      * @var \Illuminate\Filesystem\Filesystem
      */
-    protected $filesystem;
+    protected $files;
 
     /**
      * Create a new file engine instance.
      *
-     * @param  \Illuminate\Filesystem\Filesystem  $filesystem
+     * @param  \Illuminate\Filesystem\Filesystem  $files
      * @return void
      */
-    public function __construct(Filesystem $filesystem)
+    public function __construct(Filesystem $files)
     {
-        $this->filesystem = $filesystem;
+        $this->files = $files;
     }
 
     /**
@@ -55,7 +55,7 @@ protected function evaluatePath($path, $data)
         // flush out any stray output that might get out before an error occurs or
         // an exception is thrown. This prevents any partial views from leaking.
         try {
-            $this->filesystem->getRequire($path, $data);
+            $this->files->getRequire($path, $data);
         } catch (Throwable $e) {
             $this->handleViewException($e, $obLevel);
         }

src/Illuminate/View/ViewServiceProvider.php

@@ -147,7 +147,7 @@ public function registerPhpEngine($resolver)
     public function registerBladeEngine($resolver)
     {
         $resolver->register('blade', function () {
-            return new CompilerEngine($this->app['files'], $this->app['blade.compiler']);
+            return new CompilerEngine($this->app['blade.compiler'], $this->app['files']);
         });
     }
 }

tests/View/ViewCompilerEngineTest.php

@@ -41,6 +41,6 @@ public function testViewsAreNotRecompiledIfTheyAreNotExpired()
 
     protected function getEngine()
     {
-        return new CompilerEngine(new Filesystem, m::mock(CompilerInterface::class));
+        return new CompilerEngine(m::mock(CompilerInterface::class), new Filesystem);
     }
 }

tests/View/ViewFactoryTest.php

@@ -489,7 +489,7 @@ public function testExceptionsInSectionsAreThrown()
         $this->expectException(ErrorException::class);
         $this->expectExceptionMessage('section exception message');
 
-        $engine = new CompilerEngine(new Filesystem, m::mock(CompilerInterface::class));
+        $engine = new CompilerEngine(m::mock(CompilerInterface::class), new Filesystem);
         $engine->getCompiler()->shouldReceive('getCompiledPath')->andReturnUsing(function ($path) {
             return $path;
         });