Merge branch 'b-7.5.x-phpunit12-OXDEV-9641' into b-7.5.x

Author: tkcreateit

CHANGELOG-v13.md

@@ -9,3 +9,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Update module to work with OXID eShop 7.5
 - Minimum PHP version is now 8.3, tested up to PHP 8.5
+- Upgraded PHPUnit from 11 to 12

composer.json

@@ -16,7 +16,7 @@
         "myclabs/php-enum": "^1.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "^11.4",
+        "phpunit/phpunit": "^12.0",
         "ext-xdebug": "*",
         "oxid-esales/oxideshop-ce": "dev-b-7.5.x",
         "phpstan/phpstan": "^1.10",

tests/Integration/Infrastructure/LegacyTest.php

@@ -16,6 +16,7 @@
 use OxidEsales\GraphQL\Base\Exception\InvalidLogin;
 use OxidEsales\GraphQL\Base\Infrastructure\Legacy;
 use OxidEsales\GraphQL\Base\Tests\Integration\TestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class LegacyTest extends TestCase
 {
@@ -50,9 +51,7 @@ public function testInvalidLogin(): void
         );
     }
 
-    /**
-     * @dataProvider loginResponseTestDataProvider
-     */
+    #[DataProvider('loginResponseTestDataProvider')]
     public function testLoginResponseIsAnonymousOnLoginMissing(
         ?string $login,
         ?string $password,

tests/Integration/Infrastructure/RefreshTokenRepositoryTest.php

@@ -195,8 +195,8 @@ private function checkRefreshTokenWithIdExists(string $oxid): bool
     public function addToken(
         string $oxid,
         string $expires,
-        string $userId = null,
-        string $token = null,
+        ?string $userId = null,
+        ?string $token = null,
     ): void {
         $insertTokensQuery = "insert into `oegraphqlrefreshtoken` (OXID, OXUSERID, TOKEN, EXPIRES_AT)
             values (:oxid, :oxuserid, :token, :expires)";

tests/Integration/Infrastructure/RepositoryTest.php

@@ -14,11 +14,12 @@
 use OxidEsales\GraphQL\Base\DataType\Pagination\Pagination;
 use OxidEsales\GraphQL\Base\DataType\Sorting\Sorting as BaseSorting;
 use OxidEsales\GraphQL\Base\Infrastructure\Repository;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-/**
- * @covers OxidEsales\GraphQL\Base\Infrastructure\Repository
- */
+#[AllowMockObjectsWithoutExpectations]
+#[CoversClass(\OxidEsales\GraphQL\Base\Infrastructure\Repository::class)]
 final class RepositoryTest extends TestCase
 {
     public function testFatalErrorOnWrongClassById(): void

tests/Integration/Infrastructure/TokenTest.php

@@ -21,7 +21,9 @@
 use OxidEsales\GraphQL\Base\Infrastructure\Token as TokenInfrastructure;
 use OxidEsales\GraphQL\Base\Service\Token;
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 
+#[AllowMockObjectsWithoutExpectations]
 class TokenTest extends IntegrationTestCase
 {
     private const TEST_TOKEN_ID = '_my_test_token';

tests/Integration/TestCase.php

@@ -27,10 +27,12 @@
 use OxidEsales\GraphQL\Base\Service\Authorization;
 use OxidEsales\GraphQL\Base\Service\ModuleConfiguration;
 use OxidEsales\GraphQL\Base\Service\Token;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
+#[AllowMockObjectsWithoutExpectations]
 abstract class TestCase extends IntegrationTestCase
 {
     protected static $queryResult;
@@ -126,25 +128,21 @@ protected function setAuthToken(string $token): void
         $tokenService = static::$container->get(Token::class);
         $refClass = new ReflectionClass(Token::class);
         $prop = $refClass->getProperty('token');
-        $prop->setAccessible(true);
         $prop->setValue($tokenService, $authToken);
 
         $authentication = static::$container->get(Authentication::class);
         $refClass = new ReflectionClass(Authentication::class);
         $prop = $refClass->getProperty('tokenService');
-        $prop->setAccessible(true);
         $prop->setValue($authentication, $tokenService);
 
         $authorization = static::$container->get(Authorization::class);
         $refClass = new ReflectionClass(Authorization::class);
         $prop = $refClass->getProperty('tokenService');
-        $prop->setAccessible(true);
         $prop->setValue($authorization, $tokenService);
 
         $schema = static::$container->get(SchemaFactory::class);
         $refClass = new ReflectionClass(SchemaFactory::class);
         $prop = $refClass->getProperty('schema');
-        $prop->setAccessible(true);
         $prop->setValue($schema, null);
     }
 
@@ -217,7 +215,6 @@ protected function uploadFile(
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 
         $response = curl_exec($ch);
-        curl_close($ch);
 
         return json_decode($response, true) ?: [];
     }

tests/Unit/BaseTestCase.php

@@ -24,9 +24,11 @@
 use OxidEsales\GraphQL\Base\Service\Token;
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
 use OxidEsales\GraphQL\Base\Service\TokenValidator;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
+#[AllowMockObjectsWithoutExpectations]
 abstract class BaseTestCase extends TestCase
 {
     protected function getModuleConfigurationMock(string $lifetime = '+8 hours'): ModuleConfiguration

tests/Unit/Controller/LoginTest.php

@@ -19,9 +19,11 @@
 use OxidEsales\GraphQL\Base\Service\LoginServiceInterface;
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
 use OxidEsales\GraphQL\Base\Tests\Unit\BaseTestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
+#[AllowMockObjectsWithoutExpectations]
 class LoginTest extends BaseTestCase
 {
     /** @var Legacy|MockObject */

tests/Unit/Controller/TokenTest.php

@@ -23,9 +23,11 @@
 use OxidEsales\GraphQL\Base\Service\Token as TokenService;
 use OxidEsales\GraphQL\Base\Service\TokenAdministration as TokenAdministration;
 use OxidEsales\GraphQL\Base\Tests\Unit\BaseTestCase;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 //todo: tests do not do any assertions, fix it.
+#[AllowMockObjectsWithoutExpectations]
 class TokenTest extends BaseTestCase
 {
     public function testTokensQueryWithDefaultFilters(): void
@@ -123,11 +125,11 @@ public function testRefreshGivesStringValueOfNewToken(): void
     }
 
     private function getTokenController(
-        TokenAdministration $tokenAdministration = null,
-        Authentication $authentication = null,
-        Authorization $authorization = null,
-        TokenService $tokenService = null,
-        RefreshTokenServiceInterface $refreshTokenService = null,
+        ?TokenAdministration $tokenAdministration = null,
+        ?Authentication $authentication = null,
+        ?Authorization $authorization = null,
+        ?TokenService $tokenService = null,
+        ?RefreshTokenServiceInterface $refreshTokenService = null,
     ): TokenController {
         return new TokenController(
             tokenAdministration: $tokenAdministration ?? $this->createStub(TokenAdministration::class),