Merge pull request #28 from Stillat/laravel-11-support

Laravel 11 support

Author: JohnathonKoster

.github/workflows/tests.yml

@@ -14,9 +14,12 @@ jobs:
     strategy:
       matrix:
         php: [8.1, 8.2]
-        laravel: [9.*, 10.*]
+        laravel: [9.*, 10.*, 11.*]
         stability: [prefer-lowest, prefer-stable]
         os: [ubuntu-latest]
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -12,14 +12,16 @@
     },
     "require": {
         "php": "^8.1",
-        "laravel/framework": "^9.36 || ^10.0"
+        "laravel/framework": "^9.36 || ^10.0  || ^11.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5 || ^9.0",
+        "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
         "orchestra/testbench": "*",
         "laravel/pint": "^1.4",
         "brianium/paratest": "*"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "extra": {
         "laravel": {
             "providers": [

phpunit.dist.xml

@@ -1,23 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="tests/bootstrap.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
     <testsuites>
         <testsuite name="Stillat Blade Parser Suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
     <php>
-        <ini name="memory_limit" value="2048M" />
+        <ini name="memory_limit" value="2048M"/>
     </php>
-</phpunit>
+</phpunit>

tests/Compiler/CoreDirectivesWithoutArgumentsTest.php

@@ -17,7 +17,7 @@ public function testCoreDirectivesCanBeCompiledWithoutArgumentsAndNotThrowNullRe
         $this->compiler->compileString($directive);
     }
 
-    public function coreDirectives(): array
+    public static function coreDirectives(): array
     {
         return collect(array_diff(CoreDirectiveRetriever::instance()->getDirectiveNames(), ['foreach', 'forelse', 'endverbatim', 'use']))->map(function ($name) {
             return ['@'.$name];

tests/Compiler/NodeTransformerTest.php

@@ -95,7 +95,7 @@ public function testNodeTransformerCanTransformNodesWithoutCoreDirectives($templ
         $this->assertSame($expected, $this->transform($blade, false));
     }
 
-    public function templateProvider(): array
+    public static function templateProvider(): array
     {
         $templates = [
             '@if (true) something @endif',

tests/Parser/BasicParserNodesTest.php

@@ -620,7 +620,7 @@ public function testNotDirectivesWithoutLeadingSpacesAreHandledCorrectly()
         $this->assertSame($template, (string) $doc);
     }
 
-    public function coreDirectives()
+    public static function coreDirectives()
     {
         return collect(CoreDirectiveRetriever::instance()->getNonStructureDirectiveNames())->map(function ($name) {
             return [$name];

tests/Parser/EscapedContentTest.php

@@ -86,7 +86,7 @@ public function testCoreDirectivesEscapedOutput($template, $output)
         $this->assertSame($output, $this->compiler->compileString($template));
     }
 
-    public function coreDirectiveEscapedContent()
+    public static function coreDirectiveEscapedContent()
     {
         return collect(CoreDirectiveRetriever::instance()->getDirectiveNames())->map(function ($name) {
             return ['@@'.$name, '@'.$name];

tests/Parser/IncompleteDocumentsTest.php

@@ -43,7 +43,7 @@ public function testIncompleteDocumentsThree(string $template)
         $this->assertSame($template, (string) $doc);
     }
 
-    public function charSplitWithVerbatim()
+    public static function charSplitWithVerbatim()
     {
         $template = <<<'EOT'
 start @verbatim
@@ -64,7 +64,7 @@ public function charSplitWithVerbatim()
         return DocumentSplitter::splitDocumentOnChar($template);
     }
 
-    public function splitWithVerbatim()
+    public static function splitWithVerbatim()
     {
         $template = <<<'EOT'
 start @verbatim start
@@ -115,7 +115,7 @@ public function splitWithVerbatim()
         return DocumentSplitter::splitDocumentOnNewLines($template);
     }
 
-    public function splitWelcomeView()
+    public static function splitWelcomeView()
     {
         $template = <<<'EOT'
 <!DOCTYPE html>

tests/Validation/DebugDirectiveTest.php

@@ -40,14 +40,14 @@ public function testDebugDirectiveValidatorDoesNotDetectIssues(string $directive
         $this->assertCount(0, $results);
     }
 
-    public function debugDirectives()
+    public static function debugDirectives()
     {
         return collect(CoreDirectiveRetriever::instance()->getDebugDirectiveNames())->map(function ($directive) {
             return [$directive];
         })->values()->all();
     }
 
-    public function nonDebugDirectives()
+    public static function nonDebugDirectives()
     {
         $debug = CoreDirectiveRetriever::instance()->getDebugDirectiveNames();
 

tests/Validation/InconsistentDirectiveCasingTest.php

@@ -46,7 +46,7 @@ public function testInconsistentDirectiveCasingValidatorDoesNotDetectIssues($dir
         $this->assertCount(0, $results);
     }
 
-    public function directiveNames()
+    public static function directiveNames()
     {
         return collect(CoreDirectiveRetriever::instance()->getDirectiveNames())->map(function ($s) {
             return [$s];