chore: try and make PHPStan happy

phikiphp · Nov 5, 2024 · b7626b1 · b7626b1
1 parent 4326eff
commit b7626b1
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -27,12 +27,12 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require-dev": {
-        "symfony/var-dumper": "^7.1.5",
-        "pestphp/pest": "^3.3",
+        "symfony/var-dumper": "^7.1.6",
+        "pestphp/pest": "^3.5.1",
         "laravel/pint": "^1.18.1",
-        "phpstan/phpstan": "^1.12.6",
+        "phpstan/phpstan": "^1.12.7",
         "phpstan/extension-installer": "^1.4.3",
-        "illuminate/support": "^11.27"
+        "illuminate/support": "^11.30"
     },
     "config": {
         "allow-plugins": {

diff --git a/src/Contracts/ProvidesContentName.php b/src/Contracts/ProvidesContentName.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Phiki\Contracts;
+
+interface ProvidesContentName
+{
+    /**
+     * Get the name to apply to nested content.
+     * 
+     * @return string|null
+     */
+    public function getContentName(): ?string;
+}
diff --git a/src/Grammar/BeginEndPattern.php b/src/Grammar/BeginEndPattern.php
@@ -5,10 +5,11 @@
 use Exception;
 use Phiki\Contracts\ContainsCapturesInterface;
 use Phiki\Contracts\PatternCollectionInterface;
+use Phiki\Contracts\ProvidesContentName;
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
-class BeginEndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface
+class BeginEndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
         public Regex $begin,
@@ -22,6 +23,11 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
+    public function getContentName(): ?string
+    {
+        return $this->contentName;
+    }
+
     public function getPatterns(): array
     {
         return $this->patterns;

diff --git a/src/Grammar/BeginWhilePattern.php b/src/Grammar/BeginWhilePattern.php
@@ -5,10 +5,11 @@
 use Exception;
 use Phiki\Contracts\ContainsCapturesInterface;
 use Phiki\Contracts\PatternCollectionInterface;
+use Phiki\Contracts\ProvidesContentName;
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
-class BeginWhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface
+class BeginWhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
         public Regex $begin,
@@ -22,6 +23,11 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
+    public function getContentName(): ?string
+    {
+        return $this->contentName;
+    }
+
     public function getPatterns(): array
     {
         return $this->patterns;

diff --git a/src/Grammar/EndPattern.php b/src/Grammar/EndPattern.php
@@ -5,10 +5,11 @@
 use Exception;
 use Phiki\Contracts\ContainsCapturesInterface;
 use Phiki\Contracts\PatternCollectionInterface;
+use Phiki\Contracts\ProvidesContentName;
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
-class EndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface
+class EndPattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
         public MatchedPattern $begin,
@@ -21,6 +22,11 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
+    public function getContentName(): ?string
+    {
+        return $this->contentName;
+    }
+
     public function getPatterns(): array
     {
         return $this->patterns;

diff --git a/src/Grammar/WhilePattern.php b/src/Grammar/WhilePattern.php
@@ -5,10 +5,11 @@
 use Exception;
 use Phiki\Contracts\ContainsCapturesInterface;
 use Phiki\Contracts\PatternCollectionInterface;
+use Phiki\Contracts\ProvidesContentName;
 use Phiki\Support\Regex;
 use Phiki\Tokenizer;
 
-class WhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface
+class WhilePattern extends Pattern implements ContainsCapturesInterface, PatternCollectionInterface, ProvidesContentName
 {
     public function __construct(
         public MatchedPattern $begin,
@@ -21,6 +22,11 @@ public function __construct(
         public bool $injection = false,
     ) {}
 
+    public function getContentName(): ?string
+    {
+        return $this->contentName;
+    }
+
     public function getPatterns(): array
     {
         return $this->patterns;

diff --git a/src/Tokenizer.php b/src/Tokenizer.php
@@ -4,6 +4,7 @@
 
 use Phiki\Contracts\ContainsCapturesInterface;
 use Phiki\Contracts\PatternCollectionInterface;
+use Phiki\Contracts\ProvidesContentName;
 use Phiki\Environment\Environment;
 use Phiki\Exceptions\IndeterminateStateException;
 use Phiki\Exceptions\UnreachableException;
@@ -101,7 +102,7 @@ public function tokenizeLine(int $line, string $lineText): void
             if ($endIsMatched) {
                 $this->state->popPattern();
 
-                if ($root->contentName) {
+                if ($root instanceof ProvidesContentName && $root->getContentName() !== null) {
                     $this->state->popScope();
                 }
             }
@@ -303,8 +304,8 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
 
             $endPattern = $matched->pattern->createEndPattern($matched);
 
-            if ($matched->pattern->contentName) {
-                $this->state->pushScope($matched->pattern->contentName);
+            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
+                $this->state->pushScope($matched->pattern->getContentName());
             }
 
             if ($endPattern->hasPatterns()) {
@@ -313,7 +314,7 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
                 return;
             }
 
-            if ($matched->pattern->contentName) {
+            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
                 $this->state->popScope();
             }
 
@@ -362,8 +363,8 @@ protected function process(MatchedPattern $matched, int $line, string $lineText)
 
             $whilePattern = $matched->pattern->createWhilePattern($matched);
 
-            if ($matched->pattern->contentName) {
-                $this->state->pushScope($matched->pattern->contentName);
+            if ($matched->pattern instanceof ProvidesContentName && $matched->pattern->getContentName() !== null) {
+                $this->state->pushScope($matched->pattern->getContentName());
             }
 
             $this->state->pushPattern($whilePattern);