Update tests to account for internal changes in Twig 3.9 (probably sh…

…ould just use a Twig Environment instead of mocking this stuff...)
BabDev · May 8, 2024 · 5e6a5ae · 5e6a5ae
1 parent e15d827
commit 5e6a5ae
Showing 1 changed file with 48 additions and 21 deletions.
diff --git a/lib/Twig/Tests/View/TwigViewTest.php b/lib/Twig/Tests/View/TwigViewTest.php
@@ -24,14 +24,23 @@ public function testRendersWithATemplateSpecifiedInTheOptions(): void
     {
         $options = ['template' => 'test.html.twig'];
 
+        /** @var MockObject&Template $template */
         $template = $this->createMock(Template::class);
-        $template->expects(self::once())
-            ->method('displayBlock')
-            ->willReturnCallback(
-                static function (): void {
-                    echo 'Twig template';
-                }
-            );
+
+        // As of Twig 3.9, the internal wrapper implementation changed to accommodate the new yield strategy
+        if (method_exists(Template::class, 'yieldBlock')) {
+            $template->expects(self::once())
+                ->method('renderBlock')
+                ->willReturn('Twig template');
+        } else {
+            $template->expects(self::once())
+                ->method('displayBlock')
+                ->willReturnCallback(
+                    static function (): void {
+                        echo 'Twig template';
+                    }
+                );
+        }
 
         $this->twig->expects(self::once())
             ->method('load')
@@ -51,14 +60,23 @@ static function (): void {
 
     public function testRendersWithATemplateSpecifiedInTheConstructorWhenNotSetInTheOptions(): void
     {
+        /** @var MockObject&Template $template */
         $template = $this->createMock(Template::class);
-        $template->expects(self::once())
-            ->method('displayBlock')
-            ->willReturnCallback(
-                static function (): void {
-                    echo 'Twig template';
-                }
-            );
+
+        // As of Twig 3.9, the internal wrapper implementation changed to accommodate the new yield strategy
+        if (method_exists(Template::class, 'yieldBlock')) {
+            $template->expects(self::once())
+                ->method('renderBlock')
+                ->willReturn('Twig template');
+        } else {
+            $template->expects(self::once())
+                ->method('displayBlock')
+                ->willReturnCallback(
+                    static function (): void {
+                        echo 'Twig template';
+                    }
+                );
+        }
 
         $this->twig->expects(self::once())
             ->method('load')
@@ -77,14 +95,23 @@ static function (): void {
 
     public function testRendersWithTheDefaultTemplateWhenNotSetInConstructorOrOptions(): void
     {
+        /** @var MockObject&Template $template */
         $template = $this->createMock(Template::class);
-        $template->expects(self::once())
-            ->method('displayBlock')
-            ->willReturnCallback(
-                static function (): void {
-                    echo 'Twig template';
-                }
-            );
+
+        // As of Twig 3.9, the internal wrapper implementation changed to accommodate the new yield strategy
+        if (method_exists(Template::class, 'yieldBlock')) {
+            $template->expects(self::once())
+                ->method('renderBlock')
+                ->willReturn('Twig template');
+        } else {
+            $template->expects(self::once())
+                ->method('displayBlock')
+                ->willReturnCallback(
+                    static function (): void {
+                        echo 'Twig template';
+                    }
+                );
+        }
 
         $this->twig->expects(self::once())
             ->method('load')