Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/twig-view"
},
"require": {
"cakephp/cakephp": "dev-5.next as 5.1.0",
"cakephp/cakephp": "^5.1",
"jasny/twig-extensions": "^1.3",
"twig/markdown-extra": "^3.0",
"twig/twig": "^3.11.1"
Expand All @@ -32,7 +32,7 @@
"cakephp/debug_kit": "^5.0",
"michelf/php-markdown": "^1.9",
"mikey179/vfsstream": "^1.6.10",
"phpunit/phpunit": "^10.5.5 || ^11.1.3"
"phpunit/phpunit": "^10.5.58 || ^11.5.3 || ^12.0.9"
},
"conflict": {
"wyrihaximus/twig-view": "*"
Expand Down
4 changes: 1 addition & 3 deletions tests/TestCase/Command/CompileCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public function setUp(): void

Router::reload();
Configure::write('App.encoding', 'UTF-8');

$this->loadPlugins(['Cake/TwigView']);
}

/**
Expand Down Expand Up @@ -87,7 +85,7 @@ public function testFile()
*/
public function testPlugin()
{
$this->loadPlugins(['Cake/TwigView', 'TestTwigView']);
$this->loadPlugins(['TestTwigView']);

$this->exec('twig-view compile plugin TestTwigView');
$this->assertExitSuccess();
Expand Down