Upgrade phpunit to fit the shop

Some deprecations are still there and cannot be removed easily without heavy refactorings of old stuff

Signed-off-by: Anton Fedurtsya <[email protected]>

composer.json

@@ -27,7 +27,7 @@
   "require-dev": {
     "squizlabs/php_codesniffer": "3.*",
     "phpstan/phpstan": "^1.8.11",
-    "phpunit/phpunit": "^9.6",
+    "phpunit/phpunit": "^10.4",
     "oxid-esales/oxideshop-ce": "dev-b-7.1.x",
     "mikey179/vfsstream": "~1.6.8"
   },

tests/Integration/Image/Service/ThumbnailGeneratorInterventionTest.php

@@ -59,7 +59,7 @@ public function testGenerateThumbnail(
     }
 
 
-    public function getThumbnailDataProvider()
+    public static function getThumbnailDataProvider()
     {
         return [
             'cropped_thumbnail_of_size_800x800_when_bigger_source_size_landscape' => [

tests/Integration/Media/Repository/MediaRepositoryTest.php

@@ -76,7 +76,7 @@ public function testGetMediaByIdNotFound(): void
         $sut->getMediaById('someWrongId');
     }
 
-    public function getFolderMediaDataProvider(): \Generator
+    public static function getFolderMediaDataProvider(): \Generator
     {
         yield "first page in folder" => [
             'folder' => 'someFolder',

tests/Integration/Service/MediaTest.php

@@ -155,7 +155,7 @@ public function testFolder()
         $this->assertEquals('Folder1', $sut->imageResource->getFolderName());
     }
 
-    public function getUploadMediaDataProvider()
+    public static function getUploadMediaDataProvider()
     {
         return [
             [

tests/Unit/Image/DataTransfer/ImageSizeTest.php

@@ -34,7 +34,7 @@ public function testIsEmpty(int $width, int $height, bool $expected): void
         $this->assertSame($expected, $sut->isEmpty());
     }
 
-    public function isEmptyDataProvider(): array
+    public static function isEmptyDataProvider(): array
     {
         return [
             [0, 0, true],
@@ -56,7 +56,7 @@ public function testGetInFormat(
         $this->assertSame($expectedResult, $sut->getInFormat($format, $emptyFormat));
     }
 
-    public function getInFormatDataProvider(): array
+    public static function getInFormatDataProvider(): array
     {
         return [
             [123, 321, '%dx%d', '', '123x321'],

tests/Unit/Image/Service/ImageResourceRefactoredTest.php

@@ -52,7 +52,7 @@ public function testCalculateMediaThumbnailUrl(string $fileName, string $fileTyp
         $this->assertSame($expected, $sut->calculateMediaThumbnailUrl(fileName: $fileName, fileType: $fileType));
     }
 
-    public function mediaThumbnailUrlDataProvider(): \Generator
+    public static function mediaThumbnailUrlDataProvider(): \Generator
     {
         yield 'image' => [
             'fileName' => 'someFilename.gif',

tests/Unit/Image/Service/ImageResourceTest.php

@@ -281,7 +281,7 @@ public function testGetThumbnailUrl($sFile, ?ImageSizeInterface $imageSize = nul
         $this->assertEquals($expected ? ('https://test.com/out/pictures/ddmedia/' . $expected) : $expected, $result);
     }
 
-    public function getImagePathDataProvider(): array
+    public static function getImagePathDataProvider(): array
     {
         return [
             [
@@ -293,7 +293,7 @@ public function getImagePathDataProvider(): array
         ];
     }
 
-    public function getThumbnailPathDataProvider(): array
+    public static function getThumbnailPathDataProvider(): array
     {
         return [
             [

tests/Unit/Media/DataType/MediaTest.php

@@ -74,7 +74,7 @@ public function testIsDirectory(string $fileType, bool $expectedResult): void
         $this->assertSame($expectedResult, $sut->isDirectory());
     }
 
-    public function isDirectoryDataProvider(): \Generator
+    public static function isDirectoryDataProvider(): \Generator
     {
         yield "some gif image filetype" => ['fileType' => 'image/gif', 'expectedResult' => false];
         yield "some jpeg image filetype" => ['fileType' => 'image/jpeg', 'expectedResult' => false];

tests/Unit/Service/FileSystemServiceTest.php

@@ -27,7 +27,7 @@ public function testEnsureDirectorySuccessful(string $pathExample): void
         $this->assertTrue(is_dir($path));
     }
 
-    public function ensureDirectorySuccessCasesDataProvider(): \Generator
+    public static function ensureDirectorySuccessCasesDataProvider(): \Generator
     {
         yield ['pathExample' => 'someDirectory'];
         yield ['pathExample' => 'someDirectory/withSubDirectory'];

tests/Unit/Service/NamingServiceTest.php

@@ -52,7 +52,7 @@ public function testSanitizeFilename($filename, $expectedResult): void
         $this->assertSame($expectedResult, $sut->sanitizeFilename($filename));
     }
 
-    public function sanitizeFilenameDataProvider(): \Generator
+    public static function sanitizeFilenameDataProvider(): \Generator
     {
         yield "no extension" => ['filename' => 'somexc', 'expectedResult' => 'someyb'];
         yield "extension should not be changed" => ['filename' => 'somexc.xcabc', 'expectedResult' => 'someyb.xcabc'];
@@ -67,7 +67,7 @@ public function testGetUniqueFilename(string $filename, string $expectation): vo
         $this->assertSame($expectation, $sut->getUniqueFilename($filename));
     }
 
-    public function getUniqueFilenameDataProvider(): \Generator
+    public static function getUniqueFilenameDataProvider(): \Generator
     {
         yield 'not existing file no directory' => [
             'filename' => 'vfs://root/someSimpleFile.ext',
@@ -127,7 +127,7 @@ public function testValidateGoodFilename(string $goodFilename): void
         $this->assertTrue($sut->validateFileName($goodFilename));
     }
 
-    public function validationGoodFileNamesDataProvider(): \Generator
+    public static function validationGoodFileNamesDataProvider(): \Generator
     {
         yield ['fileName' => 'example.txt'];
     }
@@ -141,7 +141,7 @@ public function testValidateBadFilename(string $badFilename): void
         $sut->validateFileName($badFilename);
     }
 
-    public function validationBadFileNamesDataProvider(): \Generator
+    public static function validationBadFileNamesDataProvider(): \Generator
     {
         yield ['fileName' => 'someFileNameWithoutExtension'];
         yield ['fileName' => ''];

tests/Unit/Transput/RequestTest.php

@@ -42,7 +42,7 @@ public function testGetStringRequestParameter(
         }
     }
 
-    public function requestOnlyStringDataProvider(): array
+    public static function requestOnlyStringDataProvider(): array
     {
         $defaultValue = 'someDefault';
         return [
@@ -71,7 +71,7 @@ public function testGetBoolRequestParameter($requestValue, $expectedValue): void
         $this->assertSame($expectedValue, $sut->getBoolRequestParameter($paramName));
     }
 
-    public function requestBoolDataProvider(): array
+    public static function requestBoolDataProvider(): array
     {
         return [
             [null, false],
@@ -99,7 +99,7 @@ public function testGetIntRequestParameter($requestValue, $expectedValue): void
         $this->assertSame($expectedValue, $sut->getIntRequestParameter($paramName));
     }
 
-    public function getIntDataProvider(): array
+    public static function getIntDataProvider(): array
     {
         return [
             'null' => [null, 0],

tests/phpunit.xml

@@ -1,24 +1,16 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          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>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
+         requireCoverageMetadata="false">
     <testsuites>
         <testsuite name="Unit">
             <directory>Unit/</directory>
@@ -27,4 +19,9 @@
             <directory>Integration/</directory>
         </testsuite>
     </testsuites>
+    <source>
+        <include>
+            <directory suffix=".php">../src</directory>
+        </include>
+    </source>
 </phpunit>