Merge pull request #2 from bmichotte/parenthesis

Fix the use of parenthesis
beyondcode · Jul 19, 2018 · a4b85f4 · a4b85f4
2 parents 23a43be + 8d62cf0
commit a4b85f4
Show file tree

Hide file tree

Showing 5 changed files with 664 additions and 2 deletions.
diff --git a/src/Xray.php b/src/Xray.php
@@ -34,7 +34,7 @@ public function modifyView($view)
 
         $file = tempnam(sys_get_temp_dir(), $view->name());
 
-        $re = '/(@section\(([^))]+)\))(.*?)(@endsection|@show|@overwrite)/s';
+        $re = '/(@section\(([^))]+)\)+)(.*?)(@endsection|@show|@overwrite)/s';
         $viewContent = preg_replace_callback($re, function ($matches) use ($view) {
             ++$this->viewId;
             $sectionName = str_replace(["'", '"'], '', $matches[2]);
@@ -60,4 +60,4 @@ protected function isEnabledForView(string $viewName): bool
         return ! in_array($viewName, config('xray.excluded', []));
     }
 
-}
+}
diff --git a/tests/XrayTest.php b/tests/XrayTest.php
@@ -34,4 +34,16 @@ public function it_does_not_apply_middleware_on_json_responses()
 
         $this->get('/')->assertJson($data);
     }
+
+    /** @test */
+    public function it_adds_xray_when_using_parenthesis_on_sections() 
+    {
+        Route::get('/', function() {
+            return view('example2');
+        });
+
+        $response = $this->get('/');
+
+        $this->assertMatchesSnapshot($response->getContent());
+    }
 }