Merge branch 'main' into patch-1

Author: aarondfrancis

src/Blade/CodeComponent.php

@@ -27,7 +27,7 @@ class CodeComponent extends Component
     /**
      * Create a new component instance.
      *
-     * @param $language
+     * @param  $language
      * @param  null  $theme
      * @param  null  $contents
      * @param  null  $torchlightId

src/Block.php

@@ -155,7 +155,7 @@ public function clones()
     }
 
     /**
-     * @param $num
+     * @param  $num
      * @return $this
      */
     public function cloned($num)
@@ -179,7 +179,7 @@ public function placeholder($extra = '')
     }
 
     /**
-     * @param $language
+     * @param  $language
      * @return $this
      */
     public function language($language)
@@ -190,7 +190,7 @@ public function language($language)
     }
 
     /**
-     * @param $theme
+     * @param  $theme
      * @return $this
      */
     public function theme($theme)
@@ -205,7 +205,7 @@ public function theme($theme)
     }
 
     /**
-     * @param $code
+     * @param  $code
      * @return $this
      */
     public function code($code)
@@ -233,7 +233,7 @@ public function attrsAsString()
     }
 
     /**
-     * @param $processor
+     * @param  $processor
      * @return $this
      */
     public function addPostProcessor($processor)
@@ -246,7 +246,7 @@ public function addPostProcessor($processor)
     }
 
     /**
-     * @param $wrapped
+     * @param  $wrapped
      * @return $this
      */
     public function wrapped($wrapped)
@@ -292,7 +292,7 @@ public function toRequestParams()
     }
 
     /**
-     * @param $theme
+     * @param  $theme
      * @return mixed|string
      */
     protected function normalizeArrayTheme($theme)
@@ -311,7 +311,7 @@ protected function normalizeArrayTheme($theme)
     }
 
     /**
-     * @param $code
+     * @param  $code
      * @return string
      */
     protected function clean($code)
@@ -323,7 +323,7 @@ protected function clean($code)
     }
 
     /**
-     * @param $code
+     * @param  $code
      * @return string
      */
     protected function replaceTabs($code)
@@ -338,7 +338,7 @@ protected function replaceTabs($code)
     }
 
     /**
-     * @param $code
+     * @param  $code
      * @return string
      */
     protected function dedent($code)

src/Manager.php

@@ -71,15 +71,15 @@ public function client()
     }
 
     /**
-     * @param $value
+     * @param  $value
      */
     public function currentlyCompilingViews($value)
     {
         $this->currentlyCompilingViews = $value;
     }
 
     /**
-     * @param $blocks
+     * @param  $blocks
      * @return mixed
      */
     public function highlight($blocks)
@@ -120,7 +120,7 @@ public function addPostProcessors($classes)
     }
 
     /**
-     * @param $blocks
+     * @param  $blocks
      */
     public function postProcessBlocks($blocks)
     {
@@ -149,6 +149,10 @@ public function postProcessBlocks($blocks)
 
     public function processFileContents($file)
     {
+        if (Str::startsWith($file, '##LARAVEL_TRIM_FIXER##')) {
+            return false;
+        }
+
         $directories = $this->config('snippet_directories', []);
 
         // Add a blank path to account for absolute paths.
@@ -170,7 +174,7 @@ public function processFileContents($file)
     /**
      * Get an item out of the config using dot notation.
      *
-     * @param $key
+     * @param  $key
      * @param  null  $default
      * @return mixed
      */
@@ -192,7 +196,7 @@ public function config($key, $default = null)
      * A callback function used to access configuration. By default this
      * is null, which will fall through to Laravel's `config` function.
      *
-     * @param $callback
+     * @param  $callback
      */
     public function getConfigUsing($callback)
     {
@@ -245,7 +249,7 @@ public function findTorchlightIds($content)
     }
 
     /**
-     * @param $processor
+     * @param  $processor
      * @return PostProcessor
      *
      * @throws ConfigurationException

src/TorchlightServiceProvider.php

@@ -112,7 +112,7 @@ public function decorateGrahamCampbellEngines()
     /**
      * Decorate a single view engine.
      *
-     * @param $name
+     * @param  $name
      */
     protected function decorateEngine($name)
     {

tests/MiddlewareAndComponentTest.php

@@ -239,6 +239,18 @@ public function code_contents_can_be_a_file_2()
         });
     }
 
+    /** @test */
+    public function file_must_be_passed_via_contents()
+    {
+        $this->fakeNullResponse('component');
+
+        $this->getView('file-must-be-passed-through-contents.blade.php');
+
+        Http::assertSent(function ($request) {
+            return $request['blocks'][0]['code'] === config_path('app.php');
+        });
+    }
+
     /** @test */
     public function dedent_works_properly()
     {

tests/Support/file-must-be-passed-through-contents.blade.php

@@ -0,0 +1,3 @@
+<x-torchlight-code torchlight-id='component' language='php'>
+    {{ config_path("app.php") }}
+</x-torchlight-code>