Merge pull request #39 from michalsn/fix/view_fragment

fix: view fragment

Author: michalsn

src/View/View.php

@@ -158,10 +158,6 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
      */
     public function fragment(string $name)
     {
-        if (empty($this->renderVars['options']['fragments'])) {
-            return;
-        }
-
         $this->fragmentStack[] = $name;
 
         ob_start();
@@ -174,10 +170,6 @@ public function fragment(string $name)
      */
     public function endFragment()
     {
-        if (empty($this->renderVars['options']['fragments'])) {
-            return;
-        }
-
         $contents = ob_get_clean();
 
         if ($this->fragmentStack === []) {
@@ -217,7 +209,7 @@ protected function renderFragment(string $fragmentName)
      */
     public function include(string $view, ?array $options = null, $saveData = true): string
     {
-        if ($this->fragmentStack !== []) {
+        if ($this->fragmentStack !== [] && ! empty($this->renderVars['options']['fragments'])) {
             $options['fragments'] = $this->renderVars['options']['fragments'];
             echo $this->render($view, $options, $saveData);
 

tests/CommonTest.php

@@ -63,4 +63,28 @@ public function testViewFragmentSaveData(): void
 
         $this->assertSame($expected, view_fragment('view_fragment', ['sample1', 'sample2'], $data, ['saveData' => true]));
     }
+
+    public function testViewFragmentWithLayout(): void
+    {
+        $data = [
+            'testString1' => 'Hello World',
+            'testString2' => 'Hello World',
+        ];
+
+        $expected = "Hello World, fragment1!\nHello World, fragment2!\n";
+
+        $this->assertSame($expected, view_fragment('with_fragment', ['sample1', 'sample2'], $data));
+    }
+
+    public function testViewFragmentFromLayout(): void
+    {
+        $data = [
+            'testString1' => 'Hello World',
+            'testString2' => 'Hello World',
+        ];
+
+        $expected = "Page bottom";
+
+        $this->assertSame($expected, view_fragment('with_fragment', 'sample0', $data));
+    }
 }