Fix for Drupal 11 compatibility.

merkle-open · Oct 31, 2024 · 01bc9dd · 01bc9dd
1 parent 94eacc6
commit 01bc9dd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "twig/twig": "^3.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": ">=9.0"
     },
     "scripts": {
         "tests": [

diff --git a/src/Twig/TerrificCompiler.php b/src/Twig/TerrificCompiler.php
@@ -6,7 +6,7 @@
 
 use Namics\Terrific\Provider\ContextProviderInterface;
 use Namics\Terrific\Twig\Data\VariableNameAndArrayKeysPair;
-use Namics\Terrific\Twig\Extension\TerrificExtension;
+use Namics\Terrific\Twig\TwigExtension\TerrificExtension;
 use Namics\Terrific\Twig\Utility\ExpressionHandler;
 use Twig\Compiler;
 use Twig\Error\Error;

diff --git a/src/Twig/Extension/TerrificExtension.php → src/Twig/TwigExtension/TerrificExtension.php b/src/Twig/Extension/TerrificExtension.php → src/Twig/TwigExtension/TerrificExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Namics\Terrific\Twig\Extension;
+namespace Namics\Terrific\Twig\TwigExtension;
 
 use Namics\Terrific\Provider\ContextProviderInterface;
 use Namics\Terrific\Twig\TokenParser\ComponentTokenParser;

diff --git a/.../Twig/Extension/TerrificExtensionTest.php → ...g/TwigExtension/TerrificExtensionTest.php b/.../Twig/Extension/TerrificExtensionTest.php → ...g/TwigExtension/TerrificExtensionTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Namics\Test\Terrific\Twig\Extension;
+namespace Namics\Test\Terrific\Twig\TwigExtension;
 
 use Namics\Terrific\Twig\TokenParser\ComponentTokenParser;
 use Namics\Test\Terrific\Twig\TwigTestBase;
@@ -11,7 +11,7 @@
  * Class TerrificExtensionTest.
  *
  * @package Namics\Test\Terrific\Twig\Extension
- * @coversDefaultClass \Namics\Terrific\Twig\Extension\TerrificExtension
+ * @coversDefaultClass \Namics\Terrific\Twig\TwigExtension\TerrificExtension
  */
 class TerrificExtensionTest extends TwigTestBase {
 

diff --git a/test/Twig/TwigTestBase.php b/test/Twig/TwigTestBase.php
@@ -5,7 +5,7 @@
 namespace Namics\Test\Terrific\Twig;
 
 use Namics\Terrific\Provider\ContextProviderInterface;
-use Namics\Terrific\Twig\Extension\TerrificExtension;
+use Namics\Terrific\Twig\TwigExtension\TerrificExtension;
 use Namics\Terrific\Twig\TokenParser\ComponentTokenParser;
 use PHPUnit\Framework\TestCase;
 
@@ -29,7 +29,7 @@ protected function getContextProviderMock(): ContextProviderInterface {
   /**
    * Get the Terrific Twig extension.
    *
-   * @return \Namics\Terrific\Twig\Extension\TerrificExtension
+   * @return \Namics\Terrific\Twig\TwigExtension\TerrificExtension
    *   The Terrific Twig extension.
    */
   protected function getTwigExtension(): TerrificExtension {