OXDEV-7732: Adjust tests for phpunit 10; Move logo a directory up;

OXID-eSales · Apr 25, 2024 · 9d6fac0 · 9d6fac0
1 parent d11ff26
commit 9d6fac0
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.1.0] - Unreleased
 
 ### Changed
-- Use PHPUnit 10 in composer.json
+- Use PHPUnit 10
 - Updated the structure to Codeception 5
 
 ### Removed

diff --git a/assets/pictures/logo.png → assets/logo.png b/assets/pictures/logo.png → assets/logo.png
diff --git a/metadata.php b/metadata.php
@@ -16,8 +16,8 @@
 $aModule = [
     'id'          => 'oe_graphql_configuration_access',
     'title'       => 'GraphQL Configuration Access',
-    'description' =>  'GraphQL Configuration Access',
-    'thumbnail'   => 'pictures/logo.png',
+    'description' => 'GraphQL Configuration Access',
+    'thumbnail'   => 'logo.png',
     'version'     => '1.0.0',
     'author'      => 'OXID eSales AG',
     'url'         => 'https://github.com/OXID-eSales/graphql-configuration-access',

diff --git a/tests/Integration/Infrastructure/ShopSettingRepositoryTest.php b/tests/Integration/Infrastructure/ShopSettingRepositoryTest.php
@@ -66,7 +66,7 @@ public function testGetterExceptionIfSettingNotExist(string $getterMethod): void
         $sut->$getterMethod('NotExistant');
     }
 
-    public function exceptionGetterDataProvider(): \Generator
+    public static function exceptionGetterDataProvider(): \Generator
     {
         yield ['getInteger'];
         yield ['getFloat'];
@@ -89,7 +89,7 @@ public function testSetterExceptionIfSettingNotExist(string $setterMethod, mixed
         $sut->$setterMethod('NotExistant', $value);
     }
 
-    public function exceptionSetterDataProvider(): \Generator
+    public static function exceptionSetterDataProvider(): \Generator
     {
         yield [
             'setterMethod' => 'saveIntegerSetting',

diff --git a/tests/Unit/Module/Controller/ModuleSettingControllerTest.php b/tests/Unit/Module/Controller/ModuleSettingControllerTest.php
@@ -39,7 +39,7 @@ public function testControllerProxiesParametersToServiceAndReturnsItsResult(
         $this->assertSame($expectedValue, $settingController->$controllerMethod(...$params));
     }
 
-    public function proxyTestDataProvider(): \Generator
+    public static function proxyTestDataProvider(): \Generator
     {
         $settingName = 'settingName';
 

diff --git a/tests/Unit/Shared/DataType/BooleanSettingTest.php b/tests/Unit/Shared/DataType/BooleanSettingTest.php
@@ -26,7 +26,7 @@ public function testBooleanSetting(string $name, bool $value): void
         $this->assertSame($value, $sut->getValue());
     }
 
-    public function booleanSettingDataProvider(): \Generator
+    public static function booleanSettingDataProvider(): \Generator
     {
         yield [uniqid(), true];
         yield [uniqid(), false];

diff --git a/tests/Unit/Shared/DataType/FloatSettingTest.php b/tests/Unit/Shared/DataType/FloatSettingTest.php
@@ -26,7 +26,7 @@ public function testFloatSetting(string $name, float $value): void
         $this->assertSame($value, $sut->getValue());
     }
 
-    public function floatSettingDataProvider(): \Generator
+    public static function floatSettingDataProvider(): \Generator
     {
         yield "random float" => [uniqid(), rand(1, 100) / 10];
         yield "random integer" => [uniqid(), rand(1, 100)];

diff --git a/tests/Unit/Shared/DataType/IntegerSettingTest.php b/tests/Unit/Shared/DataType/IntegerSettingTest.php
@@ -26,7 +26,7 @@ public function testIntegerSetting(string $name, int $value): void
         $this->assertSame($value, $sut->getValue());
     }
 
-    public function integerSettingDataProvider(): \Generator
+    public static function integerSettingDataProvider(): \Generator
     {
         yield "random integer" => [uniqid(), rand(1, 100)];
     }

diff --git a/tests/Unit/Shared/DataType/SettingTypeTest.php b/tests/Unit/Shared/DataType/SettingTypeTest.php
@@ -43,7 +43,7 @@ public function testIsSupported(string $settingType, bool $expectation): void
         $this->assertSame($expectation, $sut->isSupported());
     }
 
-    public function isSupportedDataProvider(): \Generator
+    public static function isSupportedDataProvider(): \Generator
     {
         yield 'not supported case' => ['settingType' => 'someRandomSettingId', 'expectation' => false];
         yield 'supported case' => ['settingType' => FieldType::ARRAY, 'expectation' => true];

diff --git a/tests/Unit/Shared/DataType/StringSettingTest.php b/tests/Unit/Shared/DataType/StringSettingTest.php
@@ -26,7 +26,7 @@ public function testStringSetting(string $name, $value): void
         $this->assertSame($value, $sut->getValue());
     }
 
-    public function stringSettingDataProvider(): \Generator
+    public static function stringSettingDataProvider(): \Generator
     {
         yield "random strings" => [uniqid(), uniqid()];
     }

diff --git a/tests/Unit/Shared/Enum/FieldTypeTest.php b/tests/Unit/Shared/Enum/FieldTypeTest.php
@@ -36,7 +36,7 @@ public function testGetEnums(string $type): void
         $this->assertContains($type, $enums);
     }
 
-    public function fieldTypesDataProvider(): \Generator
+    public static function fieldTypesDataProvider(): \Generator
     {
         yield [FieldType::ASSOCIATIVE_ARRAY];
         yield [FieldType::NUMBER];

diff --git a/tests/Unit/Shared/Infrastructure/AbstractDatabaseSettingsRepositoryTestCase.php b/tests/Unit/Shared/Infrastructure/AbstractDatabaseSettingsRepositoryTestCase.php
@@ -15,7 +15,7 @@
 
 abstract class AbstractDatabaseSettingsRepositoryTestCase extends UnitTestCase
 {
-    public function possibleGetFloatValuesDataProvider(): \Generator
+    public static function possibleGetFloatValuesDataProvider(): \Generator
     {
         yield 'float regular' => [
             'method' => 'getFloat',
@@ -43,7 +43,7 @@ public function possibleGetFloatValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetAssocCollectionValuesDataProvider(): \Generator
+    public static function possibleGetAssocCollectionValuesDataProvider(): \Generator
     {
         yield 'empty array for assoc collection' => [
             'method' => 'getAssocCollection',
@@ -67,7 +67,7 @@ public function possibleGetAssocCollectionValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetSelectValuesDataProvider(): \Generator
+    public static function possibleGetSelectValuesDataProvider(): \Generator
     {
         yield [
             'method' => 'getSelect',
@@ -107,7 +107,7 @@ public function possibleGetSelectValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetBooleanValuesDataProvider(): \Generator
+    public static function possibleGetBooleanValuesDataProvider(): \Generator
     {
         yield 'boolean as positive int' => [
             'method' => 'getBoolean',
@@ -159,7 +159,7 @@ public function possibleGetBooleanValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetIntegerValuesDataProvider(): \Generator
+    public static function possibleGetIntegerValuesDataProvider(): \Generator
     {
         yield 'int regular' => [
             'method' => 'getInteger',
@@ -176,7 +176,7 @@ public function possibleGetIntegerValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetStringValuesDataProvider(): \Generator
+    public static function possibleGetStringValuesDataProvider(): \Generator
     {
         yield [
             'method' => 'getString',
@@ -216,7 +216,7 @@ public function possibleGetStringValuesDataProvider(): \Generator
         ];
     }
 
-    public function possibleGetCollectionValuesDataProvider(): \Generator
+    public static function possibleGetCollectionValuesDataProvider(): \Generator
     {
         yield 'empty array collection' => [
             'method' => 'getCollection',
@@ -240,7 +240,7 @@ public function possibleGetCollectionValuesDataProvider(): \Generator
         ];
     }
 
-    public function wrongSettingsValueDataProvider(): \Generator
+    public static function wrongSettingsValueDataProvider(): \Generator
     {
         yield [
             'method' => 'getInteger',

diff --git a/tests/Unit/Shared/Service/JsonCollectionEncodingServiceTest.php b/tests/Unit/Shared/Service/JsonCollectionEncodingServiceTest.php
@@ -44,7 +44,7 @@ public function testJsonDecodeCollection(string $value, array $expectedResult):
         $this->assertEquals($expectedResult, $sut->decodeStringCollectionToArray($value));
     }
 
-    public function jsonDecodeCollectionDataProvider(): \Generator
+    public static function jsonDecodeCollectionDataProvider(): \Generator
     {
         yield [
             'value' => '',

diff --git a/tests/Unit/Shop/Controller/ShopSettingControllerTest.php b/tests/Unit/Shop/Controller/ShopSettingControllerTest.php
@@ -39,7 +39,7 @@ public function testControllerProxiesParametersToServiceAndReturnsItsResult(
         $this->assertSame($expectedValue, $settingController->$controllerMethod(...$params));
     }
 
-    public function proxyTestDataProvider(): \Generator
+    public static function proxyTestDataProvider(): \Generator
     {
         $settingName = 'settingName';
 

diff --git a/tests/Unit/Shop/Infrastructure/ShopSettingRepositoryGettersTest.php b/tests/Unit/Shop/Infrastructure/ShopSettingRepositoryGettersTest.php
@@ -77,7 +77,7 @@ public function testGetShopSettingWrongData(
         $sut->$method('settingName');
     }
 
-    public function wrongSettingsTypeDataProvider(): \Generator
+    public static function wrongSettingsTypeDataProvider(): \Generator
     {
         yield [
             'method' => 'getInteger',

diff --git a/tests/Unit/Shop/Infrastructure/ShopSettingRepositorySettersTest.php b/tests/Unit/Shop/Infrastructure/ShopSettingRepositorySettersTest.php
@@ -68,7 +68,7 @@ public function testSetShopIsNotCalledOnOriginalSettingTypeMissmatch(
         $sut->$method($settingName, $settingValue);
     }
 
-    public function shopSettingsSaveMethodsDataProvider(): \Generator
+    public static function shopSettingsSaveMethodsDataProvider(): \Generator
     {
         yield 'integer' => [
             'method' => 'saveIntegerSetting',

diff --git a/tests/Unit/Shop/Service/ShopSettingServiceTest.php b/tests/Unit/Shop/Service/ShopSettingServiceTest.php
@@ -44,7 +44,7 @@ public function testGetNotEncodableShopSetting(
         $this->assertEquals($expectedResult, $sut->$serviceMethod($name));
     }
 
-    public function getNotEncodableShopSettingDataProvider(): \Generator
+    public static function getNotEncodableShopSettingDataProvider(): \Generator
     {
         $name = 'settingName';
 
@@ -108,7 +108,7 @@ public function testGetEncodableShopSetting(
         );
     }
 
-    public function getEncodableShopSettingDataProvider(): \Generator
+    public static function getEncodableShopSettingDataProvider(): \Generator
     {
         yield 'getCollectionSetting' => [
             'repositoryMethod' => 'getCollection',

diff --git a/tests/Unit/Theme/Controller/ThemeSettingControllerTest.php b/tests/Unit/Theme/Controller/ThemeSettingControllerTest.php
@@ -39,7 +39,7 @@ public function testControllerProxiesParametersToServiceAndReturnsItsResult(
         $this->assertSame($expectedValue, $settingController->$controllerMethod(...$params));
     }
 
-    public function proxyTestDataProvider(): \Generator
+    public static function proxyTestDataProvider(): \Generator
     {
         $name = 'settingName';
 

diff --git a/tests/Unit/Theme/Infrastructure/ThemeSettingRepositoryGettersTest.php b/tests/Unit/Theme/Infrastructure/ThemeSettingRepositoryGettersTest.php
@@ -76,7 +76,7 @@ public function testGetNoThemeSetting(string $repositoryMethod): void
         $sut->$repositoryMethod('NotExistingSetting', 'awesomeTheme');
     }
 
-    public function noSettingExceptionDataProvider(): \Generator
+    public static function noSettingExceptionDataProvider(): \Generator
     {
         yield 'getInteger' => ['repositoryMethod' => 'getInteger', 'fieldType' => FieldType::NUMBER];
         yield 'getFloat' => ['repositoryMethod' => 'getFloat', 'fieldType' => FieldType::NUMBER];

diff --git a/tests/Unit/Theme/Infrastructure/ThemeSettingRepositorySettersTest.php b/tests/Unit/Theme/Infrastructure/ThemeSettingRepositorySettersTest.php
@@ -39,7 +39,7 @@ public function testSetterThrowsExceptionOnNotExistingSetting(
         $sut->$repositoryMethod($name, $value, $themeId);
     }
 
-    public function notExistingSettingCheckTriggerDataProvider(): \Generator
+    public static function notExistingSettingCheckTriggerDataProvider(): \Generator
     {
         yield "saveIntegerSetting" => [
             'repositoryMethod' => 'saveIntegerSetting',

diff --git a/tests/Unit/Theme/Service/ThemeSettingServiceTest.php b/tests/Unit/Theme/Service/ThemeSettingServiceTest.php
@@ -364,7 +364,7 @@ public function testChangeThemeSettingInvalidAssocCollection($value): void
         $settingService->changeAssocCollectionSetting($name, $value, 'awesomeTheme');
     }
 
-    public function invalidCollectionDataProvider(): array
+    public static function invalidCollectionDataProvider(): array
     {
         return [
             ['[2, "values"'],

diff --git a/tests/phpunit.xml b/tests/phpunit.xml
@@ -1,30 +1,27 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="../../../../bootstrap.php"
+         colors="true"
          backupGlobals="true"
-         backupStaticAttributes="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
          beStrictAboutTestsThatDoNotTestAnything="false"
-         verbose="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
-        <include>
-            <directory suffix=".php">../src</directory>
-        </include>
-    </coverage>
+         cacheDirectory=".phpunit.cache"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+>
     <testsuites>
         <testsuite name="Unit">
             <directory>Unit/</directory>
         </testsuite>
         <testsuite name="Integration">
-            <directory>Integration/</directory>
+            <directory>Integration</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">../tests</directory>
+        </exclude>
+    </source>
 </phpunit>