prepare release

spiral · Sep 16, 2022 · 98ad003 · 98ad003
1 parent efa0666
commit 98ad003
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -27,9 +27,10 @@
         }
     ],
     "require": {
-        "php": ">=8.1",
         "ext-json": "*",
-        "myclabs/deep-copy": "^1.9"
+        "php": ">=8.1",
+        "myclabs/deep-copy": "^1.9",
+        "spiral/core": "^3.0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.20",
@@ -51,7 +52,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     },
     "config": {

diff --git a/src/Compiler/Renderer/HTMLRenderer.php b/src/Compiler/Renderer/HTMLRenderer.php
@@ -31,9 +31,6 @@ public function render(Compiler $compiler, Compiler\Result $result, NodeInterfac
         }
     }
 
-    /**
-     * @psalm-suppress UndefinedClass
-     */
     private function tag(Compiler $compiler, Compiler\Result $result, Tag $node): void
     {
         $result->push(\sprintf('<%s', $node->name), $node->getContext());

diff --git a/src/Node/Block.php b/src/Node/Block.php
@@ -19,7 +19,7 @@ final class Block implements NodeInterface, AttributedInterface
     use ContextTrait;
     use AttributeTrait;
 
-    /** @var TNode[] */
+    /** @var list<TNode> */
     public array $nodes = [];
 
     public function __construct(

diff --git a/src/Node/HTML/Tag.php b/src/Node/HTML/Tag.php
@@ -30,7 +30,7 @@ final class Tag implements NodeInterface, AttributedInterface
     public array $attrs = [];
 
     /**
-     * @var TNode[]
+     * @var list<TNode>
      */
     public array $nodes = [];
 

diff --git a/src/Node/Template.php b/src/Node/Template.php
@@ -20,7 +20,7 @@ final class Template implements NodeInterface, AttributedInterface
     use ContextTrait;
 
     /**
-     * @param TNode[] $nodes
+     * @param list<TNode> $nodes
      */
     public function __construct(
         public array $nodes = []

diff --git a/src/Transform/Import/Bundle.php b/src/Transform/Import/Bundle.php
@@ -20,8 +20,8 @@ final class Bundle implements ImportInterface
     private ?Template $template = null;
 
     public function __construct(
-        private readonly string $path,
-        private readonly ?string $prefix = null,
+        private string $path,
+        private ?string $prefix = null,
         Context $context = null
     ) {
         $this->context = $context;

diff --git a/tests/Transform/MergerTest.php b/tests/Transform/MergerTest.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Spiral\Tests\Stempler\Transform;
+
+use PHPUnit\Framework\TestCase;
+use Spiral\Stempler\Node\HTML\Tag;
+use Spiral\Stempler\Node\Template;
+use Spiral\Stempler\Transform\Import\Bundle;
+use Spiral\Stempler\Transform\Merger;
+
+final class MergerTest extends TestCase
+{
+    public function testMergeWithBundle(): void
+    {
+        $merger = new Merger();
+
+        $template = $merger->merge(new Template([new Bundle('/')]), new Tag());
+
+        $this->assertCount(1, $template->nodes);
+    }
+}