OXDEV-9270 Update to phpunit 12.5

moritzdemmer · moritzdemmer · commit 16071fba3004 · 2026-02-16T12:22:32.000+01:00
diff --git a/.github/oxid-esales/twig-component.yaml b/.github/oxid-esales/twig-component.yaml
@@ -19,7 +19,7 @@ install:
           "mikey179/vfsstream": "~1.6.8",
           "oxid-esales/developer-tools": "{{ .Data.install.composer.dev_ref }}",
           "phpspec/prophecy-phpunit": "^v2.0.1",
-          "phpunit/phpunit": "^11.4"
+          "phpunit/phpunit": "^12.5"
         },
         "autoload-dev":{
           "psr-4":{
diff --git a/tests/Integration/Extensions/IncludeContentExtensionTest.php b/tests/Integration/Extensions/IncludeContentExtensionTest.php
@@ -16,8 +16,6 @@
 use OxidEsales\EshopCommunity\Tests\ContainerTrait;
 use OxidEsales\Twig\Extensions\IncludeContentExtension;
 use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockBuilder;
-use PHPUnit\Framework\MockObject\MockObject;
 use Twig\Environment;
 use Twig\Error\LoaderError;
 use Twig\Extension\StringLoaderExtension;
@@ -28,25 +26,16 @@ final class IncludeContentExtensionTest extends AbstractExtensionTestCase
 {
     use ContainerTrait;
 
-    private MockBuilder $contentMockBuilder;
-    private MockObject&ContentFactory $contentFactoryMock;
+    private ContentFactory $contentFactoryStub;
     private string $spamContent = 'not spam<script>alert("spam")</script>';
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->contentMockBuilder = $this
-            ->getMockBuilder(Content::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getLanguage']);
+        $this->contentFactoryStub = $this->createStub(ContentFactory::class);
 
-        $this->contentFactoryMock = $this
-            ->getMockBuilder(ContentFactory::class)
-            ->onlyMethods(['getContent'])
-            ->getMock();
-
-        $this->contentFactoryMock
+        $this->contentFactoryStub
             ->method('getContent')
             ->willReturnMap($this->getContentMap());
     }
@@ -113,49 +102,49 @@ private function initializeExtension(bool $sanitizerEnabled): void
         $this->attachContainerToContainerFactory();
 
         $this->extension = new IncludeContentExtension(
-            $this->contentFactoryMock,
+            $this->contentFactoryStub,
             ContainerFacade::get(HtmlSanitizerInterface::class)
         );
     }
 
-    private function prepareContentMock(int $language, array $fields): MockObject
+    private function prepareContent(int $language, array $fields): Content
     {
-        $mock = $this->contentMockBuilder->getMock();
-        $mock->method('getLanguage')->willReturn($language);
+        $content = new Content();
+        $content->setLanguage($language);
 
         foreach ($fields as $field => $value) {
             $property = 'oxcontents__' . $field;
-            $mock->$property = (object)['value' => $value];
+            $content->$property = (object)['value' => $value];
         }
 
-        return $mock;
+        return $content;
     }
 
-    /** Build the content return map for the mock factory */
+    /** Build the content return map for the stub factory */
     private function getContentMap(): array
     {
         return [
-            ['ident', 'german', $this->prepareContentMock(0, [
+            ['ident', 'german', $this->prepareContent(0, [
                 'oxactive' => true,
                 'oxcontent' => 'Template code (DE)',
             ])],
-            ['ident', 'english', $this->prepareContentMock(1, [
+            ['ident', 'english', $this->prepareContent(1, [
                 'oxactive' => true,
                 'oxcontent' => 'Template code (EN)',
             ])],
-            ['ident', 'twig_code', $this->prepareContentMock(0, [
+            ['ident', 'twig_code', $this->prepareContent(0, [
                 'oxactive' => true,
                 'oxcontent' => 'In my_var I have {{ my_var }} value',
             ])],
-            ['ident', 'dynamic_content', $this->prepareContentMock(0, [
+            ['ident', 'dynamic_content', $this->prepareContent(0, [
                 'oxactive' => true,
                 'oxcontent' => 'Dynamic content',
             ])],
-            ['ident', 'not_active', $this->prepareContentMock(0, [
+            ['ident', 'not_active', $this->prepareContent(0, [
                 'oxactive' => false,
                 'oxcontent' => 'Not active content',
             ])],
-            ['ident', 'spam', $this->prepareContentMock(0, [
+            ['ident', 'spam', $this->prepareContent(0, [
                 'oxactive' => true,
                 'oxcontent' => $this->spamContent,
             ])],
diff --git a/tests/Integration/TwigEngineTest.php b/tests/Integration/TwigEngineTest.php
@@ -12,7 +12,6 @@
 use org\bovigo\vfs\vfsStream;
 use OxidEsales\Twig\Resolver\TemplateChain\TemplateChainResolverInterface;
 use OxidEsales\Twig\TwigEngine;
-use OxidEsales\Twig\TwigEngineConfigurationInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
@@ -87,15 +86,6 @@ public function testRenderFragment(): void
 
     private function getEngine(): TwigEngine
     {
-        /** @var TwigEngineConfigurationInterface $configuration */
-        $configuration = $this->getMockBuilder(TwigEngineConfigurationInterface::class)->getMock();
-        $configuration->method('getParameters')
-            ->willReturn([
-                'template_dir' => [$this->templateDirPath],
-                'is_debug' => 'false',
-                'cache_dir' => 'foo',
-            ]);
-
         $loader = new FilesystemLoader($this->templateDirPath);
 
         $engine = new Environment($loader);
diff --git a/tests/Unit/Escaper/DecEntityEscaperTest.php b/tests/Unit/Escaper/DecEntityEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new DecEntityEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Escaper/HexEntityEscaperTest.php b/tests/Unit/Escaper/HexEntityEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new HexEntityEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Escaper/HexEscaperTest.php b/tests/Unit/Escaper/HexEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new HexEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Escaper/HtmlAllEscaperTest.php b/tests/Unit/Escaper/HtmlAllEscaperTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new HtmlAllEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public static function escapeProvider(): array
diff --git a/tests/Unit/Escaper/MailEscaperTest.php b/tests/Unit/Escaper/MailEscaperTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new MailEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public static function escapeProvider(): array
diff --git a/tests/Unit/Escaper/NonStdEscaperTest.php b/tests/Unit/Escaper/NonStdEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new NonStdEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Escaper/QuotesEscaperTest.php b/tests/Unit/Escaper/QuotesEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new QuotesEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Escaper/UrlPathInfoEscaperTest.php b/tests/Unit/Escaper/UrlPathInfoEscaperTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->escaper = new UrlPathInfoEscaper();
-        $this->environment = $this->createMock(Environment::class);
+        $this->environment = $this->createStub(Environment::class);
     }
 
     public function testEscape(): void
diff --git a/tests/Unit/Extensions/IncludeWidgetExtensionTest.php b/tests/Unit/Extensions/IncludeWidgetExtensionTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
 
     public function testIncludeWidget(): void
     {
-        $widgetControl = $this->createMock(WidgetControl::class);
+        $widgetControl = $this->createStub(WidgetControl::class);
         $widgetControl->method('start')->willReturn('html');
         Registry::set(WidgetControl::class, $widgetControl);
 
diff --git a/tests/Unit/Extensions/StyleExtensionTest.php b/tests/Unit/Extensions/StyleExtensionTest.php
@@ -37,7 +37,7 @@ public static function dataProvider(): array
 
     private function getTwigEnvironment($isDynamic): Environment
     {
-        $loader = $this->getMockBuilder(LoaderInterface::class)->getMock();
+        $loader = $this->createStub(LoaderInterface::class);
         $env = new Environment($loader, []);
         $env->addGlobal('__oxid_include_dynamic', $isDynamic);
         return $env;
diff --git a/tests/Unit/Loader/CmsLoaderTest.php b/tests/Unit/Loader/CmsLoaderTest.php
@@ -13,32 +13,28 @@
 use OxidEsales\EshopCommunity\Internal\Transition\Adapter\TemplateLogic\ContentFactory;
 use OxidEsales\Twig\Loader\CmsLoader;
 use OxidEsales\Twig\Loader\CmsTemplateNameParser;
-use PHPUnit\Framework\MockObject\MockBuilder;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Twig\Error\LoaderError;
 
 final class CmsLoaderTest extends TestCase
 {
     private CmsLoader $contentTemplateLoader;
-    private MockBuilder $contentMockBuilder;
 
     public function setUp(): void
     {
         parent::setUp();
-        $this->contentMockBuilder = $this->getMockBuilder(Content::class)->onlyMethods(['getLanguage']);
 
-        $validContentMock = $this->prepareContentMock(
+        $validContent = $this->prepareContent(
             0,
             ['oxactive' => true, 'oxcontent' => "Template code (DE)", 'oxtimestamp' => '2018-10-09 09:32:06']
         );
 
-        $englishContentMock = $this->prepareContentMock(
+        $englishContent = $this->prepareContent(
             1,
             ['oxactive' => true, 'oxcontent' => "Template code (EN)", 'oxtimestamp' => '2018-10-09 09:32:06']
         );
 
-        $fieldContentMock = $this->prepareContentMock(
+        $fieldContent = $this->prepareContent(
             0,
             [
                 'oxactive' => true,
@@ -47,32 +43,29 @@ public function setUp(): void
             ]
         );
 
-        $notFreshContentMock = $this->prepareContentMock(
+        $notFreshContent = $this->prepareContent(
             0,
             ['oxactive' => true, 'oxtimestamp' => '2018-10-09 09:40:25']
         );
 
-        $notValidContentMock = $this->prepareContentMock(0, ['oxactive' => false]);
+        $notValidContent = $this->prepareContent(0, ['oxactive' => false]);
 
-        $contentFactoryMock = $this
-            ->getMockBuilder(ContentFactory::class)
-            ->onlyMethods(['getContent'])
-            ->getMock();
+        $contentFactoryStub = $this->createStub(ContentFactory::class);
 
-        $contentFactoryMock
+        $contentFactoryStub
             ->method('getContent')
             ->willReturnMap(
                 [
-                    ['ident', 'valid', $validContentMock],
-                    ['oxid', 'english', $englishContentMock],
-                    ['ident', 'field', $fieldContentMock],
-                    ['oxid', 'notFresh', $notFreshContentMock],
-                    ['ident', 'notValid', $notValidContentMock]
+                    ['ident', 'valid', $validContent],
+                    ['oxid', 'english', $englishContent],
+                    ['ident', 'field', $fieldContent],
+                    ['oxid', 'notFresh', $notFreshContent],
+                    ['ident', 'notValid', $notValidContent]
                 ]
             );
 
-        /** @var ContentFactory $contentFactoryMock */
-        $this->contentTemplateLoader = new CmsLoader(new CmsTemplateNameParser(), $contentFactoryMock);
+        /** @var ContentFactory $contentFactoryStub */
+        $this->contentTemplateLoader = new CmsLoader(new CmsTemplateNameParser(), $contentFactoryStub);
     }
 
     /**
@@ -143,16 +136,16 @@ public function testGetCacheKey(): void
         );
     }
 
-    private function prepareContentMock(int $language, array $fields): MockObject
+    private function prepareContent(int $language, array $fields): Content
     {
-        $mock = $this->contentMockBuilder->getMock();
-        $mock->method('getLanguage')->willReturn($language);
+        $content = new Content();
+        $content->setLanguage($language);
 
         foreach ($fields as $field => $value) {
             $fieldName = 'oxcontents__' . $field;
-            $mock->$fieldName = (object) ['value' => $value];
+            $content->$fieldName = (object) ['value' => $value];
         }
 
-        return $mock;
+        return $content;
     }
 }
diff --git a/tests/Unit/Resolver/TemplateChain/TemplateChainResolverTest.php b/tests/Unit/Resolver/TemplateChain/TemplateChainResolverTest.php
@@ -22,11 +22,11 @@ public function testGetLastChildWithMultipleCallsWillUseCachedResult(): void
     {
         $templateName = 'widget/header.html.twig';
 
-        $templateTypeMock = $this->createMock(TemplateTypeInterface::class);
-        $lastChildMock = $this->createConfiguredMock(TemplateTypeInterface::class, [
+        $templateTypeMock = $this->createStub(TemplateTypeInterface::class);
+        $lastChildMock = $this->createConfiguredStub(TemplateTypeInterface::class, [
             'getFullyQualifiedName' => '@my_module/widget/header.html.twig'
         ]);
-        $templateChainMock = $this->createConfiguredMock(TemplateChain::class, [
+        $templateChainMock = $this->createConfiguredStub(TemplateChain::class, [
             'getLastChild' => $lastChildMock
         ]);
 
diff --git a/tests/Unit/TokenParser/CaptureTokenParserTest.php b/tests/Unit/TokenParser/CaptureTokenParserTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $loader = $this->getMockBuilder(LoaderInterface::class)->getMock();
+        $loader = $this->createStub(LoaderInterface::class);
         $this->environment = new Environment($loader, ['cache' => false]);
 
         $this->captureTokenParser = new CaptureTokenParser();
diff --git a/tests/Unit/TokenParser/HasRightsTokenParserTest.php b/tests/Unit/TokenParser/HasRightsTokenParserTest.php
@@ -54,7 +54,7 @@ public function testDecideMyTagForkCorrect(): void
 
     public function testParse(): void
     {
-        $loader = $this->getMockBuilder(LoaderInterface::class)->getMock();
+        $loader = $this->createStub(LoaderInterface::class);
         $env = new Environment($loader, array('cache' => false, 'autoescape' => false));
         $env->addExtension(new HasRightsExtension(new HasRightsTokenParser(HasRightsNode::class)));
 
@@ -75,7 +75,7 @@ public function testParse(): void
 
     public function testParseException(): void
     {
-        $loader = $this->getMockBuilder(LoaderInterface::class)->getMock();
+        $loader = $this->createStub(LoaderInterface::class);
         $env = new Environment($loader, ['cache' => false, 'autoescape' => false]);
         $env->addExtension(new HasRightsExtension(new HasRightsTokenParser(HasRightsNode::class)));
 
diff --git a/tests/Unit/TokenParser/IfContentTokenParserTest.php b/tests/Unit/TokenParser/IfContentTokenParserTest.php
@@ -25,7 +25,7 @@ final class IfContentTokenParserTest extends TestCase
 
     protected function setUp(): void
     {
-        $loader = $this->getMockBuilder(LoaderInterface::class)->getMock();
+        $loader = $this->createStub(LoaderInterface::class);
         $this->environment = new Environment($loader, ['cache' => false]);
 
         $this->ifContentParser = new IfContentTokenParser();
diff --git a/tests/Unit/TwigEngineConfigurationTest.php b/tests/Unit/TwigEngineConfigurationTest.php
@@ -19,18 +19,18 @@ final class TwigEngineConfigurationTest extends TestCase
 {
     public function testGetParameters(): void
     {
-        $context = $this->createConfiguredMock(
+        $context = $this->createConfiguredStub(
             ContextInterface::class,
             [
                 'getTemplateCacheDirectory' => 'dummy_cache_dir',
                 'getCurrentShopId' => 1
             ]
         );
-        $twigContext = $this->createConfiguredMock(
+        $twigContext = $this->createConfiguredStub(
             TwigContextInterface::class,
             ['getIsDebug' => true]
         );
-        $twigTemplateCacheService = $this->createConfiguredMock(
+        $twigTemplateCacheService = $this->createConfiguredStub(
             ShopTemplateCacheServiceInterface::class,
             ['getCacheDirectory' => 'dummy_cache_dir']
         );
diff --git a/tests/phpunit.xml b/tests/phpunit.xml

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`parent::setUp();`
`26`	`26`	`$this->escaper = new DecEntityEscaper();`
`27`		`- $this->environment = $this->createMock(Environment::class);`
	`27`	`+ $this->environment = $this->createStub(Environment::class);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function testEscape(): void`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ protected function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`parent::setUp();`
`27`	`27`	`$this->escaper = new HtmlAllEscaper();`
`28`		`- $this->environment = $this->createMock(Environment::class);`
	`28`	`+ $this->environment = $this->createStub(Environment::class);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public static function escapeProvider(): array`