Merge branch '2.x' into command-name

Author: markstory

.phive/phars.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
+  <phar name="phpstan" version="2.1.33" installed="2.1.33" location="./tools/phpstan" copy="false"/>
 </phive>

README.md

@@ -9,7 +9,7 @@
 
 This plugin allows you to use the [Twig Templating Language](https://twig.symfony.com/doc/) for your views.
 
-It provides wrappers for common View opertions and many helpful extensions that expose CakePHP functions and `jasny/twig-extensions` helpers.
+It provides wrappers for common View operations and many helpful extensions that expose CakePHP functions and `jasny/twig-extensions` helpers.
 
 ## Installation
 

composer.json

@@ -33,7 +33,7 @@
         "cakephp/debug_kit": "^5.0",
         "michelf/php-markdown": "^1.9",
         "mikey179/vfsstream": "^1.6.10",
-        "phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.0"
+        "phpunit/phpunit": "^11.5.3 | ^12.1.3"
     },
     "conflict": {
         "wyrihaximus/twig-view": "*"

src/Command/CompileCommand.php

@@ -18,6 +18,14 @@ class CompileCommand extends BaseCommand
      */
     protected TwigView $twigView;
 
+    /**
+     * @return string
+     */
+    public static function getDescription(): string
+    {
+        return 'Compile Twig templates for caching.';
+    }
+
     /**
      * @inheritDoc
      */

tests/TestCase/Twig/FileLoaderTest.php

@@ -18,6 +18,7 @@
 
 namespace Cake\TwigView\Test\TestCase\Twig;
 
+use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
 use Cake\TwigView\Twig\FileLoader;
 use Twig\Error\LoaderError;
@@ -36,6 +37,7 @@ public function setUp(): void
     {
         parent::setUp();
 
+        Router::reload();
         $this->loadPlugins(['TestTwigView']);
 
         $this->loader = new FileLoader(['.twig']);
@@ -81,7 +83,7 @@ public function testGetCacheKeyPluginNonExistingFile()
 
     public function testIsFresh()
     {
-        file_put_contents(TMP . 'TwigViewIsFreshTest', 'TwigViewIsFreshTest');
+        file_put_contents(TMP . 'TwigViewIsFreshTest', 'is fresh test');
         $time = filemtime(TMP . 'TwigViewIsFreshTest');
 
         $this->assertTrue($this->loader->isFresh(TMP . 'TwigViewIsFreshTest', $time + 5));

tests/bootstrap.php

@@ -58,6 +58,13 @@
     'default' => [
         'engine' => 'File',
     ],
+    '_cake_core_' => [
+        'className' => 'File',
+        'prefix' => '_cake_translations_',
+        'path' => CACHE . 'persistent/',
+        'serialize' => true,
+        'duration' => '+10 seconds',
+    ],
     '_cake_translations_' => [
         'className' => 'File',
         'prefix' => '_cake_translations_',