OXDEV-7518 Upgrade phpunit from 9 to 10

OXID-eSales · Nov 29, 2023 · 2f02c0b · 2f02c0b
1 parent 5dc0c77
commit 2f02c0b
Show file tree

Hide file tree

Showing 45 changed files with 187 additions and 137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## v2.2.0 - unreleased
 
+### Added
+- PHPUnit v10 support
+
+### Removed
+- PHPUnit v9 support
+
 ### Deprecated
 - `SmartyCycleExtension` will be removed
 

diff --git a/tests/Integration/Extensions/Filters/PhpFunctionsExtensionTest.php b/tests/Integration/Extensions/Filters/PhpFunctionsExtensionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         $this->extension = new PhpFunctionsExtension();
     }
 
-    public function dummyTemplateProvider(): array
+    public static function dummyTemplateProvider(): array
     {
         return [
             ["{% set foo = 'bar'|parse_url %}{{ foo['path'] }}", 'bar'],

diff --git a/tests/Integration/Extensions/Filters/RegexReplaceExtensionTest.php b/tests/Integration/Extensions/Filters/RegexReplaceExtensionTest.php
@@ -24,15 +24,14 @@ protected function setUp(): void
         $this->extension = new RegexReplaceExtension();
     }
 
-    public function dummyTemplateProvider(): array
+    public static function dummyTemplateProvider(): array
     {
         return [
             ["{{ '1-foo-2'|regex_replace('/[0-9]/', 'bar') }}", "bar-foo-bar"],
         ];
     }
 
     /**
-     *
      * @dataProvider dummyTemplateProvider
      */
     public function testIfPhpFunctionsAreCallable(string $template, string $expected)

diff --git a/tests/Integration/Extensions/Filters/TranslateExtensionTest.php b/tests/Integration/Extensions/Filters/TranslateExtensionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php //phpcs:disable
 
 /**
  * Copyright © OXID eSales AG. All rights reserved.
@@ -28,10 +28,7 @@ protected function setUp(): void
         $this->extension = $this->get(TranslateExtension::class);
     }
 
-    /**
-     * Provides data to testSimpleTranslating
-     */
-    public function simpleTranslatingProvider(): array
+    public static function simpleTranslatingProvider(): array
     {
         return [
             ["{{ 'FIRST_NAME'|translate }}", 0, 'Vorname'],
@@ -41,9 +38,6 @@ public function simpleTranslatingProvider(): array
     }
 
     /**
-     * Tests simple translating, where only translation is fetched
-     *
-     *
      * @dataProvider simpleTranslatingProvider
      */
     public function testSimpleTranslating(string $template, int $languageId, string $expected): void
@@ -52,10 +46,7 @@ public function testSimpleTranslating(string $template, int $languageId, string
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    /**
-     * Provides data to testTranslatingWithArguments
-     */
-    public function withArgumentsProvider(): array
+    public static function withArgumentsProvider(): array
     {
         return [
             ["{{ 'MANUFACTURER_S'|translate('Opel') }}", 0, '| Hersteller: Opel'],
@@ -66,8 +57,6 @@ public function withArgumentsProvider(): array
     }
 
     /**
-     * Tests value translating when translating strings containing %s
-     *
      * @dataProvider withArgumentsProvider
      */
     public function testTranslatingWithArguments(string $template, int $languageId, string $expected): void
@@ -76,21 +65,22 @@ public function testTranslatingWithArguments(string $template, int $languageId,
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    /**
-     * Provides data to testTranslateFrontend_isMissingTranslation
-     */
-    public function missingTranslationProviderFrontend(): array
+    public static function missingTranslationProviderFrontend(): array
     {
         return [
             [true, "{{ 'MY_MISING_TRANSLATION'|translate }}", 'MY_MISING_TRANSLATION'],
-            [false, "{{ 'MY_MISING_TRANSLATION'|translate }}", 'ERROR: Translation for MY_MISING_TRANSLATION not found!'],
+            [false, "{{ 'MY_MISING_TRANSLATION'|translate }}", 'ERROR: Translation for MY_MISING_TRANSLATION not found!'], //phpcs:disable
         ];
     }
 
     /**
      * @dataProvider missingTranslationProviderFrontend
      */
-    public function testTranslateFrontendIsMissingTranslation(bool $isProductiveMode, string $template, string $expected): void
+    public function testTranslateFrontendIsMissingTranslation(
+        bool $isProductiveMode,
+        string $template,
+        string $expected
+    ): void
     {
         $this->setAdminMode(false);
         $this->setLanguage(1);
@@ -102,10 +92,7 @@ public function testTranslateFrontendIsMissingTranslation(bool $isProductiveMode
         $this->assertStringContainsString($expected, $this->getTemplate($template)->render([]));
     }
 
-    /**
-     * Provides data to testTranslateAdmin_isMissingTranslation
-     */
-    public function missingTranslationProviderAdmin(): array
+    public static function missingTranslationProviderAdmin(): array
     {
         return [
             ["{{ 'MY_MISING_TRANSLATION'|translate }}", 'ERROR: Translation for MY_MISING_TRANSLATION not found!'],

diff --git a/tests/Integration/Extensions/Filters/TranslateSalutationExtensionTest.php b/tests/Integration/Extensions/Filters/TranslateSalutationExtensionTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
         $this->setLanguage(0);
     }
 
-    public function translateSalutationProvider(): array
+    public static function translateSalutationProvider(): array
     {
         return [
             ["{{ 'MR'|translate_salutation }}", 'Herr'],
@@ -39,7 +39,7 @@ public function testTranslateSalutation(string $template, string $expected): voi
     {
         $translateSalutationLogic = $this->getMockBuilder(TranslateSalutationLogic::class)
             ->disableOriginalConstructor()
-            ->setMethods(['translateSalutation'])->getMock();
+            ->onlyMethods(['translateSalutation'])->getMock();
 
         $translateSalutationLogic->expects($this->once())->method('translateSalutation')->willReturn(
             $expected

diff --git a/tests/Integration/Extensions/Filters/TruncateExtensionTest.php b/tests/Integration/Extensions/Filters/TruncateExtensionTest.php
@@ -1,4 +1,4 @@
-<?php
+<?php //phpcs:disable
 
 /**
  * Copyright © OXID eSales AG. All rights reserved.
@@ -32,7 +32,7 @@ public function testTruncate(string $template, string $expected): void
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function truncateProvider(): array
+    public static function truncateProvider(): array
     {
         return [
             [
@@ -54,7 +54,7 @@ public function testTruncateWithLength(string $template, string $expected): void
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function truncateProviderWithLength(): array
+    public static function truncateProviderWithLength(): array
     {
         return [
             [
@@ -80,7 +80,7 @@ public function testTruncateWithSuffix(string $template, string $expected): void
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function truncateProviderWithSuffix(): array
+    public static function truncateProviderWithSuffix(): array
     {
         return [
             [
@@ -98,7 +98,7 @@ public function testTruncateWithBreakWords(string $template, string $expected):
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function truncateProviderWithBreakWords(): array
+    public static function truncateProviderWithBreakWords(): array
     {
         return [
             [

diff --git a/tests/Integration/Extensions/Filters/WordwrapExtensionTest.php b/tests/Integration/Extensions/Filters/WordwrapExtensionTest.php
@@ -24,10 +24,7 @@ protected function setUp(): void
         $this->extension = new WordwrapExtension(new WordwrapLogic());
     }
 
-    /**
-     * Provides data for testWordWrapWithNonAscii
-     */
-    public function nonAsciiProvider(): array
+    public static function nonAsciiProvider(): array
     {
         return [
             ['{{ "HÖ HÖ"|wordwrap(2) }}', "HÖ\nHÖ"],
@@ -45,10 +42,8 @@ public function testWordWrapWithNonAscii(string $template, string $expected): vo
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    /**
-     * Provides data for testWordWrapAscii
-     */
-    public function asciiProvider(): array
+    //phpcs:disable
+    public static function asciiProvider(): array
     {
         return [
             ['{{ "aaa aaa"|wordwrap(2) }}', "aaa\naaa"],
@@ -65,6 +60,7 @@ public function asciiProvider(): array
             ]
         ];
     }
+    //phpcs:enable
 
     /**
      * @dataProvider asciiProvider

diff --git a/tests/Integration/Extensions/FormatPriceExtensionTest.php b/tests/Integration/Extensions/FormatPriceExtensionTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
         $this->extension = new FormatPriceExtension($formatPriceLogic);
     }
 
-    public function priceProvider(): array
+    public static function priceProvider(): array
     {
         return [
             ['{{ format_price(100) }}', '100,00 €'],

diff --git a/tests/Integration/Extensions/GetRequestVariablesExtensionTest.php b/tests/Integration/Extensions/GetRequestVariablesExtensionTest.php
@@ -31,7 +31,7 @@ protected function tearDown(): void
         unset($_GET['foo']);
     }
 
-    public function dummyTemplateProvider(): array
+    public static function dummyTemplateProvider(): array
     {
         return [
             ['{{ get_global_cookie("foo") }}', 'bar'],

diff --git a/tests/Integration/Extensions/IncludeContentExtensionTest.php b/tests/Integration/Extensions/IncludeContentExtensionTest.php
@@ -78,7 +78,7 @@ public function testContent(string $template, string $expected): void
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function contentProvider(): array
+    public static function contentProvider(): array
     {
         return [
             [

diff --git a/tests/Integration/Extensions/InputHelpExtensionTest.php b/tests/Integration/Extensions/InputHelpExtensionTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
         $this->inputHelpExtension = new InputHelpExtension($inputHelpLogic);
     }
 
-    public function getIdentProvider(): array
+    public static function getIdentProvider(): array
     {
         return [
             [null, 1, false, null],
@@ -48,7 +48,7 @@ public function testGetIdent($params, $iLang, $blAdmin, $expected): void
         $this->assertEquals($expected, $this->inputHelpExtension->getHelpId($params));
     }
 
-    public function getHelpTextProvider(): array
+    public static function getHelpTextProvider(): array
     {
         return [
             [null, 1, false, null],

diff --git a/tests/Integration/Extensions/MailtoExtensionTest.php b/tests/Integration/Extensions/MailtoExtensionTest.php
@@ -30,7 +30,8 @@ public function testMailto(string $template, string $expected, array $variables
         $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
     }
 
-    public function getMailtoTests(): array
+    //phpcs:disable
+    public static function getMailtoTests(): array
     {
         return [
             [

diff --git a/tests/Integration/Extensions/PhpFunctionsExtensionTest.php b/tests/Integration/Extensions/PhpFunctionsExtensionTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
         $this->extension = new PhpFunctionsExtension();
     }
 
-    public function dummyTemplateProvider(): array
+    public static function dummyTemplateProvider(): array
     {
         return [
             ["{{ count({0:0, 1:1, 2:2}) }}", 3],

diff --git a/tests/Integration/Extensions/ScriptExtensionTest.php b/tests/Integration/Extensions/ScriptExtensionTest.php
@@ -32,10 +32,10 @@ public function testScript(string $template, string $expected): void
         $this->assertEquals($expected, $this->getTemplate($template)->render([]));
     }
 
-    public function getScriptTests(): array
+    //phpcs:disable
+    public static function getScriptTests(): array
     {
         return [
-            // Empty buffer
             [
                 "{{ script() }}",
                 ""

diff --git a/tests/Integration/Extensions/SmartyCycleExtensionTest.php b/tests/Integration/Extensions/SmartyCycleExtensionTest.php
@@ -27,7 +27,7 @@ public function testStaticCycle(string $template, string $expected, array $varia
         $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
     }
 
-    public function getStaticCycle(): array
+    public static function getStaticCycle(): array
     {
         return [
             [

diff --git a/tests/Integration/Extensions/TranslateExtensionTest.php b/tests/Integration/Extensions/TranslateExtensionTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         $this->translateExtension = $this->get(TranslateExtension::class);
     }
 
-    public function dataProvider(): array
+    public static function dataProvider(): array
     {
         return [
             [['ident' => 'foobar'], 'ERROR: Translation for foobar not found!'],

diff --git a/tests/Integration/Extensions/UrlExtensionTest.php b/tests/Integration/Extensions/UrlExtensionTest.php
@@ -38,7 +38,7 @@ public function testAddUrlParameters(string $template, string $expected, array $
         $this->assertEquals($expected, $this->getTemplate($template)->render($variables));
     }
 
-    public function getSeoUrlTests(): array
+    public static function getSeoUrlTests(): array
     {
         return [
             [
@@ -48,7 +48,7 @@ public function getSeoUrlTests(): array
         ];
     }
 
-    public function getAddUrlParametersTests(): array
+    public static function getAddUrlParametersTests(): array
     {
         return [
             [

diff --git a/tests/Integration/Resolver/TemplateFileResolverTest.php b/tests/Integration/Resolver/TemplateFileResolverTest.php
@@ -27,7 +27,7 @@ public function testResolveSmartyTemplate(string $templateName, string $expected
         $this->assertEquals($expectedFilename, $filename);
     }
 
-    public function templateNameFileDataProvider(): array
+    public static function templateNameFileDataProvider(): array
     {
         return [
             [

diff --git a/...tegration/TwigEngine/ControllerRender/Fixtures/module1/src/Contoller/ModuleController.php b/...tegration/TwigEngine/ControllerRender/Fixtures/module1/src/Contoller/ModuleController.php
@@ -13,5 +13,5 @@
 
 class ModuleController extends FrontendController
 {
-    protected $_sThisTemplate = '@module1/module_controller';
+    protected $_sThisTemplate = '@module1/module_controller'; //phpcs:disable
 }
diff --git a/...ngine/ControllerRender/Fixtures/module1/src/Contoller/ModuleControllerMissingTemplate.php b/...ngine/ControllerRender/Fixtures/module1/src/Contoller/ModuleControllerMissingTemplate.php
@@ -11,6 +11,7 @@
 
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 
+//phpcs:disable
 class ModuleControllerMissingTemplate extends FrontendController
 {
     protected $_sThisTemplate = '@module1/module_controller_missing_template';

diff --git a/tests/Integration/TwigEngine/TemplateChainSorting/ModulesTemplateChainSortingTest.php b/tests/Integration/TwigEngine/TemplateChainSorting/ModulesTemplateChainSortingTest.php
@@ -68,7 +68,7 @@ public function testRenderWithShopTemplateAndSorting(string $sorting, string $ex
         $this->assertStringContainsString($expectedResult, $actual);
     }
 
-    public function renderShopTemplateDataProvider(): array
+    public static function renderShopTemplateDataProvider(): array
     {
         return [
             [
@@ -124,7 +124,7 @@ public function testRenderWithModuleTemplateAndSorting(string $sorting, string $
         $this->assertStringContainsString($expectedResult, $actual);
     }
 
-    public function renderModuleTemplateDataProvider(): array
+    public static function renderModuleTemplateDataProvider(): array
     {
         return [
             [
@@ -176,7 +176,7 @@ public function testRenderWithShopTemplateAmdFaultySortingConfiguration(
         $this->assertStringContainsString($expectedResult, $actual);
     }
 
-    public function renderWithShopTemplateAndFaultySortingConfigDataProvider(): array
+    public static function renderWithShopTemplateAndFaultySortingConfigDataProvider(): array
     {
         return [
             [
@@ -223,7 +223,7 @@ public function testRenderWithModuleTemplateAndFaultySortingConfiguration(
         $this->assertStringContainsString($expectedResult, $actual);
     }
 
-    public function renderWithModuleTemplateAndFaultySortingConfigDataProvider(): array
+    public static function renderWithModuleTemplateAndFaultySortingConfigDataProvider(): array
     {
         return [
             [