PHP 8.1-8.3 code hardening + PHP 8.4 version bump

composer.json

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": "^8.3"
+        "php": "^8.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",

src/CommonMark/CodeBlockRenderer.php

@@ -12,13 +12,14 @@
 use Tempest\Highlight\Highlighter;
 use Tempest\Highlight\WebTheme;
 
-final class CodeBlockRenderer implements NodeRendererInterface
+final readonly class CodeBlockRenderer implements NodeRendererInterface
 {
     public function __construct(
         private Highlighter $highlighter = new Highlighter(),
     ) {
     }
 
+    #[\Override]
     public function render(Node $node, ChildNodeRendererInterface $childRenderer)
     {
         if (! $node instanceof FencedCode) {

src/CommonMark/HighlightExtension.php

@@ -10,13 +10,14 @@
 use League\CommonMark\Extension\ExtensionInterface;
 use Tempest\Highlight\Highlighter;
 
-final class HighlightExtension implements ExtensionInterface
+final readonly class HighlightExtension implements ExtensionInterface
 {
     public function __construct(
         private ?Highlighter $highlighter = new Highlighter(),
     ) {
     }
 
+    #[\Override]
     public function register(EnvironmentBuilderInterface $environment): void
     {
         $environment

src/CommonMark/InlineCodeBlockRenderer.php

@@ -11,13 +11,14 @@
 use League\CommonMark\Renderer\NodeRendererInterface;
 use Tempest\Highlight\Highlighter;
 
-final class InlineCodeBlockRenderer implements NodeRendererInterface
+final readonly class InlineCodeBlockRenderer implements NodeRendererInterface
 {
     public function __construct(
         private Highlighter $highlighter = new Highlighter(),
     ) {
     }
 
+    #[\Override]
     public function render(Node $node, ChildNodeRendererInterface $childRenderer)
     {
         if (! $node instanceof Code) {

src/IsInjection.php

@@ -14,7 +14,7 @@ public function parse(string $content, Highlighter $highlighter): ParsedInjectio
     {
         $pattern = $this->getPattern();
 
-        if (! str_starts_with($pattern, '/')) {
+        if (! str_starts_with((string) $pattern, '/')) {
             $pattern = "/{$pattern}/";
         }
 

src/IsPattern.php

@@ -12,7 +12,7 @@ public function match(string $content): array
     {
         $pattern = $this->getPattern();
 
-        if (! str_starts_with($pattern, '/')) {
+        if (! str_starts_with((string) $pattern, '/')) {
             $pattern = "/$pattern/";
         }
 

src/Languages/Base/BaseLanguage.php

@@ -19,11 +19,13 @@
 
 abstract class BaseLanguage implements Language
 {
+    #[\Override]
     public function getAliases(): array
     {
         return [];
     }
 
+    #[\Override]
     public function getInjections(): array
     {
         return [
@@ -36,6 +38,7 @@ public function getInjections(): array
         ];
     }
 
+    #[\Override]
     public function getPatterns(): array
     {
         return [

src/Languages/Base/Injections/AdditionInjection.php

@@ -13,6 +13,7 @@
 #[After]
 final readonly class AdditionInjection implements Injection
 {
+    #[\Override]
     public function parse(string $content, Highlighter $highlighter): ParsedInjection
     {
         // Standardize line endings

src/Languages/Base/Injections/CustomClassInjection.php

@@ -12,6 +12,7 @@
 
 final readonly class CustomClassInjection implements Injection
 {
+    #[\Override]
     public function parse(string $content, Highlighter $highlighter): ParsedInjection
     {
         $pattern = '/(?<start>{\:(?<class>[\w-]+)\:)(?<match>(.|\n)*?)(?<end>:})/';

src/Languages/Base/Injections/DeletionInjection.php

@@ -13,6 +13,7 @@
 #[After]
 final readonly class DeletionInjection implements Injection
 {
+    #[\Override]
     public function parse(string $content, Highlighter $highlighter): ParsedInjection
     {
         // Standardize line endings

src/Languages/Base/Injections/GutterInjection.php

@@ -15,7 +15,7 @@ final class GutterInjection implements Injection
     private array $icons = [];
     private array $classes = [];
 
-    public function __construct(private int $startAt = 1)
+    public function __construct(private readonly int $startAt = 1)
     {
     }
 
@@ -33,6 +33,7 @@ public function addClass(int $line, string $class): self
         return $this;
     }
 
+    #[\Override]
     public function parse(string $content, Highlighter $highlighter): ParsedInjection
     {
         $lines = preg_split('/\R/u', trim($content, "\n"));

src/Languages/Base/Patterns/AdditionEndTokenPattern.php

@@ -15,11 +15,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '/(?<match>\+})/';
     }
 
+    #[\Override]
     public function getTokenType(): TokenType
     {
         return new IgnoreTokenType();

src/Languages/Base/Patterns/AdditionStartTokenPattern.php

@@ -15,11 +15,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '/(?<match>{\+)/';
     }
 
+    #[\Override]
     public function getTokenType(): TokenType
     {
         return new IgnoreTokenType();

src/Languages/Base/Patterns/DeletionEndTokenPattern.php

@@ -16,11 +16,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '/(?<!-)(?<match>\-})/';
     }
 
+    #[\Override]
     public function getTokenType(): TokenType
     {
         return new IgnoreTokenType();

src/Languages/Base/Patterns/DeletionStartTokenPattern.php

@@ -16,11 +16,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '/(?<match>{\-)(?!-)/';
     }
 
+    #[\Override]
     public function getTokenType(): TokenType
     {
         return new IgnoreTokenType();

src/Languages/Base/Patterns/InjectionTokenPattern.php

@@ -13,11 +13,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return Escape::INJECTION_TOKEN . '(?<match>(.|\n)*?)' . Escape::INJECTION_TOKEN;
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::INJECTION;

src/Languages/Blade/BladeLanguage.php

@@ -16,11 +16,13 @@
 
 class BladeLanguage extends HtmlLanguage
 {
+    #[\Override]
     public function getName(): string
     {
         return 'blade';
     }
 
+    #[\Override]
     public function getInjections(): array
     {
         return [
@@ -32,6 +34,7 @@ public function getInjections(): array
         ];
     }
 
+    #[\Override]
     public function getPatterns(): array
     {
         return [

src/Languages/Blade/Injections/BladeEchoInjection.php

@@ -12,11 +12,13 @@
 {
     use IsInjection;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '({{(?!--))(?<match>.*)(}})';
     }
 
+    #[\Override]
     public function parseContent(string $content, Highlighter $highlighter): string
     {
         return $highlighter->parse($content, 'php');

src/Languages/Blade/Injections/BladeKeywordInjection.php

@@ -12,11 +12,13 @@
 {
     use IsInjection;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '(\@[\w]+)\s?\((?<match>.*)\)';
     }
 
+    #[\Override]
     public function parseContent(string $content, Highlighter $highlighter): string
     {
         return $highlighter->parse($content, 'php');

src/Languages/Blade/Injections/BladePhpInjection.php

@@ -12,11 +12,13 @@
 {
     use IsInjection;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '\@php(?<match>(.|\n)*?)\@endphp';
     }
 
+    #[\Override]
     public function parseContent(string $content, Highlighter $highlighter): string
     {
         return $highlighter->parse($content, 'php');

src/Languages/Blade/Injections/BladeRawEchoInjection.php

@@ -12,11 +12,13 @@
 {
     use IsInjection;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '({!!)(?<match>.*)(!!})';
     }
 
+    #[\Override]
     public function parseContent(string $content, Highlighter $highlighter): string
     {
         return $highlighter->parse($content, 'php');

src/Languages/Blade/Patterns/BladeCommentPattern.php

@@ -17,11 +17,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '(?<match>\{\{\-\-(.|\n)*?\-\-\}\})';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::COMMENT;

src/Languages/Blade/Patterns/BladeComponentCloseTagPattern.php

@@ -17,11 +17,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '<\/(?<match>[\w\-\:\.]+)';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::KEYWORD;

src/Languages/Blade/Patterns/BladeComponentOpenTagPattern.php

@@ -17,11 +17,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '<(?<match>[\w\-\:\.]+)';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::KEYWORD;

src/Languages/Blade/Patterns/BladeKeywordPattern.php

@@ -18,11 +18,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '(?<match>\@[\w]+)\b';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::KEYWORD;

src/Languages/Css/CssLanguage.php

@@ -15,18 +15,21 @@
 
 class CssLanguage extends BaseLanguage
 {
+    #[\Override]
     public function getName(): string
     {
         return 'css';
     }
 
+    #[\Override]
     public function getInjections(): array
     {
         return [
             ...parent::getInjections(),
         ];
     }
 
+    #[\Override]
     public function getPatterns(): array
     {
         return [

src/Languages/Css/Patterns/CssAttributePattern.php

@@ -21,11 +21,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '(?<match>[\w\-]+):';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::PROPERTY;

src/Languages/Css/Patterns/CssCommentPattern.php

@@ -20,11 +20,13 @@
 {
     use IsPattern;
 
+    #[\Override]
     public function getPattern(): string
     {
         return '/(?<match>\/\*(.|\n)*?\*\/)/m';
     }
 
+    #[\Override]
     public function getTokenType(): TokenTypeEnum
     {
         return TokenTypeEnum::COMMENT;