Adjust regex to support single and double quotes

Author: mauricius

src/View/BladeFragment.php

@@ -14,7 +14,7 @@ public static function render(string $view, string $fragment, array $data = []):
 
         $content = File::get($path);
 
-        $re = sprintf('/@fragment\("%s"\)(.*)@endfragment/msU', $fragment);
+        $re = sprintf('/(?<!@)@fragment[ \t]*\([\'"]{1}%s[\'"]{1}\)(.*?)@endfragment/s', $fragment);
 
         preg_match($re, $content, $matches);
 

tests/FragmentBladeDirectiveTest.php

@@ -22,11 +22,21 @@ public function the_view_still_renders_correctly_if_it_contains_fragments()
     }
 
     /** @test */
-    public function the_fragment_view_macro_can_render_a_single_fragment()
+    public function the_render_fragment_view_macro_can_render_a_single_fragment_whose_name_is_enclosed_in_double_quotes()
     {
         $message = 'htmx';
 
-        $renderedView = view()->renderFragment('basic', 'test', compact('message'));
+        $renderedView = view()->renderFragment('basic', 'double', compact('message'));
+
+        $this->assertMatchesSnapshot($renderedView);
+    }
+
+    /** @test */
+    public function the_render_fragment_view_macro_can_render_a_single_fragment_whose_name_is_enclosed_in_single_quotes()
+    {
+        $message = 'htmx';
+
+        $renderedView = view()->renderFragment('basic', 'single', compact('message'));
 
         $this->assertMatchesSnapshot($renderedView);
     }

tests/Http/HtmxResponseTest.php

@@ -19,65 +19,65 @@ public function the_response_should_issue_a_soft_client_side_redirect_by_setting
     {
         Route::get('test', fn () => with(new HtmxResponse())->location('http://foobar'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Location', 'http://foobar');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Location', 'http://foobar');
     }
 
     /** @test */
     public function the_response_should_push_a_new_url_by_setting_the_hx_push_url_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->pushUrl('http://foobar'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Push-Url', 'http://foobar');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Push-Url', 'http://foobar');
     }
 
     /** @test */
     public function the_response_should_replace_the_current_url_by_setting_the_hx_replace_url_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->replaceUrl('http://foobar'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Replace-Url', 'http://foobar');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Replace-Url', 'http://foobar');
     }
 
     /** @test */
     public function the_response_should_determine_how_the_response_will_be_swapped_by_setting_the_hx_reswap_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->reswap('innerHTML'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Reswap', 'innerHTML');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Reswap', 'innerHTML');
     }
 
     /** @test */
     public function the_response_should_specify_the_target_of_the_content_to_update_by_setting_the_hx_retarget_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->retarget('.update-me'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Retarget', '.update-me');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Retarget', '.update-me');
     }
 
     /** @test */
     public function the_response_should_trigger_a_client_side_event_by_setting_the_hx_trigger_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->addTrigger('htmx:abort'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger', 'htmx:abort');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger', 'htmx:abort');
     }
 
     /** @test */
@@ -88,21 +88,21 @@ public function the_response_supports_triggering_multiple_events()
             ->addTrigger('htmx:load')
         );
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger', 'htmx:abort,htmx:load');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger', 'htmx:abort,htmx:load');
     }
 
     /** @test */
     public function the_response_should_trigger_a_client_side_event_after_the_settling_step_by_setting_the_hx_trigger_after_settle_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->addTriggerAfterSettle('htmx:abort'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger-After-Settle', 'htmx:abort');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger-After-Settle', 'htmx:abort');
     }
 
     /** @test */
@@ -113,21 +113,21 @@ public function the_response_supports_triggering_after_settle_multiple_events()
             ->addTriggerAfterSettle('htmx:load')
         );
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger-After-Settle', 'htmx:abort,htmx:load');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger-After-Settle', 'htmx:abort,htmx:load');
     }
 
     /** @test */
     public function the_response_should_trigger_a_client_side_event_after_the_swap_step_by_setting_the_hx_trigger_after_swap_header()
     {
         Route::get('test', fn () => with(new HtmxResponse())->addTriggerAfterSwap('htmx:abort'));
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger-After-Swap', 'htmx:abort');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger-After-Swap', 'htmx:abort');
     }
 
     /** @test */
@@ -138,10 +138,10 @@ public function the_response_supports_triggering_after_swap_multiple_multiple_ev
             ->addTriggerAfterSwap('htmx:load')
         );
 
-        $this
-            ->get('test')
-            ->assertOk()
-            ->assertHeader('HX-Trigger-After-Swap', 'htmx:abort,htmx:load');
+        $response = $this->get('test');
+
+        $response->assertOk();
+        $response->assertHeader('HX-Trigger-After-Swap', 'htmx:abort,htmx:load');
     }
 
     /** @test */
@@ -151,12 +151,12 @@ public function the_response_renders_a_single_fragment()
             $message = 'Htmx';
 
             return with(new HtmxResponse())
-                ->renderFragment('basic', 'test', compact('message'));
+                ->renderFragment('basic', 'double', compact('message'));
         });
 
-        $response = $this
-            ->get('test')
-            ->assertOk();
+        $response = $this->get('test');
+
+        $response->assertOk();
 
         $this->assertMatchesSnapshot($response->getContent());
     }
@@ -172,9 +172,9 @@ public function the_response_renders_multiple_fragments_for_out_of_band_swaps()
                 ->addFragment('multiple', 'lower');
         });
 
-        $response = $this
-            ->get('test')
-            ->assertOk();
+        $response = $this->get('test');
+
+        $response->assertOk();
 
         $this->assertMatchesSnapshot($response->getContent());
     }
@@ -189,9 +189,9 @@ public function the_response_returns_a_rendered_fragment()
                 ->addRenderedFragment(Blade::render('<p>Hello from {{ $message}}</p>', compact('message')));
         });
 
-        $response = $this
-            ->get('test')
-            ->assertOk();
+        $response = $this->get('test');
+
+        $response->assertOk();
 
         $this->assertMatchesSnapshot($response->getContent());
     }

…acro_can_render_a_single_fragment__1.txt …name_is_enclosed_in_double_quotes__1.txttests/__snapshots__/FragmentBladeDirectiveTest__the_fragment_view_macro_can_render_a_single_fragment__1.txt renamed to tests/__snapshots__/FragmentBladeDirectiveTest__the_render_fragment_view_macro_can_render_a_single_fragment_whose_name_is_enclosed_in_double_quotes__1.txt tests/__snapshots__/FragmentBladeDirectiveTest__the_fragment_view_macro_can_render_a_single_fragment__1.txt renamed to tests/__snapshots__/FragmentBladeDirectiveTest__the_render_fragment_view_macro_can_render_a_single_fragment_whose_name_is_enclosed_in_double_quotes__1.txt

@@ -0,0 +1 @@
+<p>Howdy from htmx</p>

tests/__snapshots__/FragmentBladeDirectiveTest__the_render_fragment_view_macro_can_render_a_single_fragment_whose_name_is_enclosed_in_single_quotes__1.txt

@@ -2,4 +2,8 @@
 
     <p>Hello from htmx</p>
 
-<h2>End</h2>
+
+
+    <p>Howdy from htmx</p>
+
+<h2>End</h2>

tests/__snapshots__/FragmentBladeDirectiveTest__the_view_still_renders_correctly_if_it_contains_fragments__1.txt

@@ -1,5 +1,9 @@
 <h1>Begin</h1>
-@fragment("test")
+@fragment("double")
     <p>Hello from {{ $message }}</p>
 @endfragment
-<h2>End</h2>
+
+@fragment('single')
+    <p>Howdy from {{ $message }}</p>
+@endfragment
+<h2>End</h2>