OXDEV-8207: Fix phpunit errors

OXID-eSales · May 27, 2024 · 4c6c81a · 4c6c81a
1 parent d6cc532
commit 4c6c81a
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 132 deletions.
diff --git a/tests/Integration/Controller/GreetingControllerTest.php b/tests/Integration/Controller/GreetingControllerTest.php
@@ -87,26 +87,26 @@ public function providerOemtGreeting(): array
     {
         return [
             'without_user_generic' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
+                'hasUser'       => false,
+                'mode'          => ModuleSettings::GREETING_MODE_GENERIC,
                 'expected'      => '',
                 'count'         => 0,
             ],
             'without_user_personal' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
+                'hasUser'       => false,
+                'mode'          => ModuleSettings::GREETING_MODE_PERSONAL,
                 'expected'      => '',
                 'count'         => 0,
             ],
             'with_user_generic' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
+                'hasUser'       => true,
+                'mode'          => ModuleSettings::GREETING_MODE_GENERIC,
                 'expect'        => self::TEST_GREETING,
                 'count'         => 0,
             ],
             'with_user_personal' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
+                'hasUser'       => true,
+                'mode'          => ModuleSettings::GREETING_MODE_PERSONAL,
                 'expect'        => self::TEST_GREETING_UPDATED,
                 'count'         => 1,
             ],
@@ -117,33 +117,33 @@ public function providerRender(): array
     {
         return [
             'without_user_generic' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
-                'expected'      => [
+                'hasUser'          => false,
+                'mode'             => ModuleSettings::GREETING_MODE_GENERIC,
+                'expected'         => [
                     'greeting' => '',
                     'counter'  => 0,
                 ],
             ],
             'without_user_personal' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
-                'expected'      => [
+                'hasUser'          => false,
+                'mode'             => ModuleSettings::GREETING_MODE_PERSONAL,
+                'expected'         => [
                     'greeting' => '',
                     'counter'  => 0,
                 ],
             ],
             'with_user_generic' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
-                'expected'      => [
+                'hasUser'          => true,
+                'mode'             => ModuleSettings::GREETING_MODE_GENERIC,
+                'expected'         => [
                     'greeting' => '',
                     'counter'  => 0,
                 ],
             ],
             'with_user_personal' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
-                'expected'      => [
+                'hasUser'          => true,
+                'mode'             => ModuleSettings::GREETING_MODE_PERSONAL,
+                'expected'         => [
                     'greeting' => self::TEST_GREETING,
                     'counter'  => 67,
                 ],

diff --git a/tests/Integration/Controller/StartControllerTest.php b/tests/Integration/Controller/StartControllerTest.php
@@ -33,7 +33,7 @@ final class StartControllerTest extends IntegrationTestCase
     /**
      * @dataProvider providerCanUpdateOemtGreeting
      */
-    public function testCanUpdateOemtGreeting(bool $hasUser, string $mode, string $expect): void
+    public function testCanUpdateOemtGreeting(bool $hasUser, string $mode, string $assert): void
     {
         $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
         $moduleSettings->saveGreetingMode($mode);
@@ -44,7 +44,7 @@ public function testCanUpdateOemtGreeting(bool $hasUser, string $mode, string $e
             $controller->setUser($this->getTestUser());
         }
 
-        $this->$expect($controller->canUpdateOemtGreeting());
+        $this->$assert($controller->canUpdateOemtGreeting());
     }
 
     /**
@@ -73,24 +73,24 @@ public function providerCanUpdateOemtGreeting(): array
     {
         return [
             'without_user_generic' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
-                'assert'        => 'assertFalse',
+                'hasUser'           => false,
+                'mode'              => ModuleSettings::GREETING_MODE_GENERIC,
+                'assert'            => 'assertFalse',
             ],
             'without_user_personal' => [
-                'user'          => false,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
-                'assert'        => 'assertFalse',
+                'hasUser'           => false,
+                'mode'              => ModuleSettings::GREETING_MODE_PERSONAL,
+                'assert'            => 'assertFalse',
             ],
             'with_user_generic' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_GENERIC,
-                'assert'        => 'assertFalse',
+                'hasUser'           => true,
+                'mode'              => ModuleSettings::GREETING_MODE_GENERIC,
+                'assert'            => 'assertFalse',
             ],
             'with_user_personal' => [
-                'user'          => true,
-                'greeting_mode' => ModuleSettings::GREETING_MODE_PERSONAL,
-                'assert'        => 'assertTrue',
+                'hasUser'           => true,
+                'mode'              => ModuleSettings::GREETING_MODE_PERSONAL,
+                'assert'            => 'assertTrue',
             ],
         ];
     }
@@ -99,24 +99,24 @@ public function providerGetOemtGreeting(): array
     {
         return [
             'without_user_generic' => [
-                'user'                   => false,
-                'greeting_mode'          => ModuleSettings::GREETING_MODE_GENERIC,
-                'expect'                 => 'OEMODULETEMPLATE_GREETING_GENERIC',
+                'hasUser'   => false,
+                'mode'      => ModuleSettings::GREETING_MODE_GENERIC,
+                'expect'    => 'OEMODULETEMPLATE_GREETING_GENERIC',
             ],
             'without_user_personal' => [
-                'user'                   => false,
-                'greeting_mode'          => ModuleSettings::GREETING_MODE_PERSONAL,
-                'expect'                 => '',
+                'hasUser'   => false,
+                'mode'      => ModuleSettings::GREETING_MODE_PERSONAL,
+                'expect'    => '',
             ],
             'with_user_generic' => [
-                'user'                   => true,
-                'greeting_mode'          => ModuleSettings::GREETING_MODE_GENERIC,
-                'expect'                 => 'OEMODULETEMPLATE_GREETING_GENERIC',
+                'hasUser'   => true,
+                'mode'      => ModuleSettings::GREETING_MODE_GENERIC,
+                'expect'    => 'OEMODULETEMPLATE_GREETING_GENERIC',
             ],
             'with_user_personal' => [
-                'user'                   => true,
-                'greeting_mode'          => ModuleSettings::GREETING_MODE_PERSONAL,
-                'expect'                 => self::TEST_GREETING,
+                'hasUser'   => true,
+                'mode'      => ModuleSettings::GREETING_MODE_PERSONAL,
+                'expect'    => self::TEST_GREETING,
             ],
         ];
     }

diff --git a/tests/Unit/Service/GreetingMessageTest.php b/tests/Unit/Service/GreetingMessageTest.php
@@ -30,7 +30,7 @@ public function testGenericGreetingNoUser(string $mode, string $expected): void
         $this->assertSame($expected, $service->getGreeting());
     }
 
-    public function getGreetingDataProvider(): array
+    public static function getGreetingDataProvider(): array
     {
         return [
             [

diff --git a/tests/Unit/Service/ModuleSettingsTest.php b/tests/Unit/Service/ModuleSettingsTest.php
@@ -31,7 +31,7 @@ public function testGetGreetingMode(string $value, string $expected): void
         $this->assertSame($expected, $sut->getGreetingMode());
     }
 
-    public function getGreetingModeDataProvider(): array
+    public static function getGreetingModeDataProvider(): array
     {
         return [
             [
@@ -67,7 +67,7 @@ public function testIsPersonalGreetingMode(string $value, bool $expected): void
         $this->assertSame($expected, $sut->isPersonalGreetingMode());
     }
 
-    public function isPersonalGreetingModeDataProvider(): array
+    public static function isPersonalGreetingModeDataProvider(): array
     {
         return [
             [

diff --git a/tests/github_actions/module-template.yml b/tests/github_actions/module-template.yml
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
-         cacheResultFile=".phpunit.cache/test-results"
-         executionOrder="depends,defects"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="false"
-         beStrictAboutTodoAnnotatedTests="false"
-         convertDeprecationsToExceptions="true"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
          stopOnIncomplete="false"
          stopOnSkipped="false"
          backupGlobals="true"
-         backupStaticAttributes="false"
-         colors="true"
-         testdox="false"
-         verbose="false">
-    <coverage includeUncoveredFiles="true"
-              processUncoveredFiles="false"
-              cacheDirectory=".phpunit.cache/code-coverage">
-        <include>
-            <directory suffix=".php">../src</directory>
-        </include>
-    </coverage>
+         backupStaticProperties="false"
+         colors="true">
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
     <testsuites>
         <testsuite name="Unit">
             <directory>Unit/</directory>
@@ -37,4 +24,12 @@
             <directory>Integration/</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">../tests</directory>
+        </exclude>
+    </source>
 </phpunit>