Merge pull request #510 from dotkernel/issue-509

arhimede · web-flow · commit c938b10d9d4f · 2026-04-23T12:06:26.000+03:00
Issue #509: Bump phpunit to v12.5.23
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -15,7 +15,6 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"
diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
@@ -16,7 +16,7 @@ jobs:
       checks: write
     strategy:
       matrix:
-        php-versions: [ '8.2', '8.3', '8.4', '8.5' ]
+        php-versions: ['8.3', '8.4', '8.5' ]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -15,7 +15,6 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"
diff --git a/.github/workflows/validate-database-schema.yml b/.github/workflows/validate-database-schema.yml
@@ -22,7 +22,6 @@ jobs:
           - ubuntu-latest
 
         php:
-          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,28 @@
 # Changelog
 
+## 7.1.0 - 2026-04-22
+
+### Changed
+
+* Issue [#509](https://github.com/dotkernel/api/issues/509): Bump `PHPUnit` to version `12.5.23` by [@SergiuBota1](https://github.com/SergiuBota1) in [#510](https://github.com/dotkernel/admin/pull/510)
+
+### Added
+
+* Nothing
+
+### Deprecated
+
+* Nothing
+
+### Removed
+
+* Removed PHP `8.2` support
+
+### Fixed
+
+* Fixed PHPUnit notices caused by mock objects without expectations configured
+* Fixed PHPUnit deprecation warnings caused by using `with()` on test stubs
+
 ## 7.0.0 - 2025-11-26
 
 ### Changed
diff --git a/README.md b/README.md
@@ -14,7 +14,8 @@ Documentation is available at: https://docs.dotkernel.org/api-documentation/
 
 | Branch | Release  | PSR-11 | OSS Lifecycle                                                                                                                        | PHP Version                                                                                         |
 |--------|----------|--------|--------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
-| 7.0    | `>= 7.0` | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F7.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/7.0.0) |
+| 7.0    | `>= 7.1` | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F7.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/7.1.0) |
+| 7.0    | `< 7.1`  | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F7.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/7.0.0) |
 | 6.0    | `< 7.0`  | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F6.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/6.1.0) |
 | 5.0    | `< 6.0`  | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F5.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/5.3.0) |
 | 4.0    | `< 5.0`  | 1      | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F4.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/4.5.0) |
@@ -30,10 +31,10 @@ Documentation is available at: https://docs.dotkernel.org/api-documentation/
 [![GitHub stars](https://img.shields.io/github/stars/dotkernel/api)](https://github.com/dotkernel/api/stargazers)
 [![GitHub license](https://img.shields.io/github/license/dotkernel/api)](https://github.com/dotkernel/api/blob/6.0/LICENSE.md)
 
-[![Build Static](https://github.com/dotkernel/api/actions/workflows/continuous-integration.yml/badge.svg?branch=6.0)](https://github.com/dotkernel/api/actions/workflows/continuous-integration.yml)
+[![Build Static](https://github.com/dotkernel/api/actions/workflows/continuous-integration.yml/badge.svg?branch=7.0)](https://github.com/dotkernel/api/actions/workflows/continuous-integration.yml)
 [![codecov](https://codecov.io/gh/dotkernel/api/graph/badge.svg?token=53FN78G5CK)](https://codecov.io/gh/dotkernel/api)
-[![Qodana](https://github.com/dotkernel/api/actions/workflows/qodana_code_quality.yml/badge.svg?branch=6.0)](https://github.com/dotkernel/api/actions/workflows/qodana_code_quality.yml)
-[![PHPStan](https://github.com/dotkernel/api/actions/workflows/static-analysis.yml/badge.svg?branch=6.0)](https://github.com/dotkernel/api/actions/workflows/static-analysis.yml)
+[![Qodana](https://github.com/dotkernel/api/actions/workflows/qodana_code_quality.yml/badge.svg?branch=7.0)](https://github.com/dotkernel/api/actions/workflows/qodana_code_quality.yml)
+[![PHPStan](https://github.com/dotkernel/api/actions/workflows/static-analysis.yml/badge.svg?branch=7.0)](https://github.com/dotkernel/api/actions/workflows/static-analysis.yml)
 
 ## Getting Started
 
diff --git a/SECURITY.md b/SECURITY.md
@@ -4,6 +4,7 @@
 
 | Version | Supported                                                                                                                            | PHP Version                                                                                         |
 |---------|--------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
+| 7.1     | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F7.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/7.1.0) |
 | 7.0     | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F7.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/7.0.0) |
 | 6.0     | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F6.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/6.1.0) |
 | 5.0     | ![OSS Lifecycle](https://img.shields.io/osslifecycle?file_url=https%3A%2F%2Fgithub.com%2Fdotkernel%2Fapi%2Fblob%2F5.0%2FOSSMETADATA) | ![PHP from Packagist (specify version)](https://img.shields.io/packagist/php-v/dotkernel/api/5.3.0) |
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         }
     },
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
         "ext-gd": "*",
         "ext-json": "*",
         "dotkernel/dot-cache": "^4.3",
@@ -89,7 +89,7 @@
         "phpstan/phpstan": "^2.1.11",
         "phpstan/phpstan-doctrine": "^2.0.2",
         "phpstan/phpstan-phpunit": "^2.0.6",
-        "phpunit/phpunit": "^10.5.45",
+        "phpunit/phpunit": "^12.5.23",
         "roave/security-advisories": "dev-latest",
         "symfony/var-dumper": "^7.2.3"
     },
diff --git a/phpunit.xml b/phpunit.xml
@@ -4,7 +4,10 @@
          bootstrap="vendor/autoload.php"
          stopOnError="true"
          stopOnFailure="true"
-         colors="true">
+         colors="true"
+         displayDetailsOnPhpunitNotices="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnPhpunitDeprecations="true">
     <testsuites>
         <testsuite name="UnitTests">
             <directory>./test/Unit</directory>
diff --git a/src/Core/src/App/src/Service/IpService.php b/src/Core/src/App/src/Service/IpService.php
@@ -19,7 +19,7 @@ class IpService
      * @phpstan-param array{
      *     HTTP_X_FORWARDED_FOR?: string,
      *     HTTP_CLIENT_IP?: string,
-     *     REMOTE_ADDR?: string,
+     *     REMOTE_ADDR: string,
      * } $server
      */
     public static function getUserIp(array $server): mixed
diff --git a/test/Functional/AdminTest.php b/test/Functional/AdminTest.php
@@ -406,7 +406,7 @@ public function testAdminCanCreateUserAccount(): void
         $userRole           = $userRoleRepository->findOneBy(['name' => UserRoleEnum::User]);
         $this->assertInstanceOf(UserRole::class, $userRole);
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $userData = [
diff --git a/test/Functional/UserTest.php b/test/Functional/UserTest.php
@@ -47,7 +47,7 @@ public function testRegisterAccountDuplicateIdentity(): void
             'status' => UserStatusEnum::Pending,
         ]);
 
-        $userAvatarService = $this->createMock(UserAvatarServiceInterface::class);
+        $userAvatarService = $this->createStub(UserAvatarServiceInterface::class);
         $this->replaceService(UserAvatarServiceInterface::class, $userAvatarService);
 
         $response = $this->post('/user/account', $this->getValidUserData(['status' => UserStatusEnum::Pending->value]));
@@ -71,7 +71,7 @@ public function testRegisterAccountDuplicateEmail(): void
             'status'   => UserStatusEnum::Pending,
         ]);
 
-        $userAvatarService = $this->createMock(UserAvatarServiceInterface::class);
+        $userAvatarService = $this->createStub(UserAvatarServiceInterface::class);
         $this->replaceService(UserAvatarServiceInterface::class, $userAvatarService);
 
         $response = $this->post('/user/account', $this->getValidUserData(['status' => UserStatusEnum::Pending->value]));
@@ -90,10 +90,10 @@ public function testRegisterAccountDuplicateEmail(): void
      */
     public function testRegisterAccount(): void
     {
-        $userAvatarService = $this->createMock(UserAvatarServiceInterface::class);
+        $userAvatarService = $this->createStub(UserAvatarServiceInterface::class);
         $this->replaceService(UserAvatarServiceInterface::class, $userAvatarService);
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $user = $this->getValidUserData([
@@ -121,7 +121,7 @@ public function testRegisterAccount(): void
     public function testCreateMyAvatar(): void
     {
         $userAvatarRepository = $this->getEntityManager()->getRepository(UserAvatar::class);
-        $userAvatarService    = $this->getMockBuilder(UserAvatarService::class)
+        $userAvatarService    = $this->getStubBuilder(UserAvatarService::class)
             ->setConstructorArgs([
                 $userAvatarRepository,
                 [],
@@ -133,7 +133,7 @@ public function testCreateMyAvatar(): void
                 'createFileName',
                 'saveAvatarImage',
             ])
-            ->getMock();
+            ->getStub();
         $this->replaceService(UserAvatarServiceInterface::class, $userAvatarService);
 
         /** @var non-empty-string $identity */
@@ -274,7 +274,7 @@ public function testActivateAccountByEmail(): void
         ]);
         $this->assertInstanceOf(UserDetail::class, $user->getDetail());
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $response = $this->post('/user/account/activate', [
@@ -342,7 +342,7 @@ public function testRequestResetPasswordExpired(): void
         $this->getEntityManager()->persist($user);
         $this->getEntityManager()->flush();
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $response = $this->patch('/user/account/reset-password/' . $resetPassword->getHash(), [
@@ -376,7 +376,7 @@ public function testRequestResetPasswordAlreadyUsed(): void
         $this->getEntityManager()->persist($user);
         $this->getEntityManager()->flush();
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $response = $this->patch('/user/account/reset-password/' . $resetPassword->getHash(), [
@@ -410,7 +410,7 @@ public function testResetPassword(): void
         $this->getEntityManager()->persist($user);
         $this->getEntityManager()->flush();
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $response = $this->patch('/user/account/reset-password/' . $resetPassword->getHash(), [
@@ -433,7 +433,7 @@ public function testResetPassword(): void
      */
     public function testResetPasswordByEmail(): void
     {
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $user = $this->createUser();
@@ -495,7 +495,7 @@ public function testRecoverAccountByIdentity(): void
         $user = $this->createUser();
         $this->assertInstanceOf(UserDetail::class, $user->getDetail());
 
-        $mailService = $this->createMock(MailService::class);
+        $mailService = $this->createStub(MailService::class);
         $this->replaceService(MailService::class, $mailService);
 
         $response = $this->post('/user/account/recover', [
diff --git a/test/Unit/Admin/Service/AdminServiceTest.php b/test/Unit/Admin/Service/AdminServiceTest.php
@@ -14,7 +14,7 @@
 use Core\Admin\Repository\AdminRepository;
 use Core\Admin\Repository\AdminRoleRepository;
 use Exception;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 
 use function array_merge;
@@ -23,16 +23,16 @@
 class AdminServiceTest extends TestCase
 {
     private AdminServiceInterface $adminService;
-    private AdminRepository&MockObject $adminRepository;
-    private AdminRoleRepository&MockObject $adminRoleRepository;
+    private AdminRepository&Stub $adminRepository;
+    private AdminRoleRepository&Stub $adminRoleRepository;
 
     /**
      * @throws \PHPUnit\Framework\MockObject\Exception
      */
     public function setUp(): void
     {
-        $this->adminRepository     = $this->createMock(AdminRepository::class);
-        $this->adminRoleRepository = $this->createMock(AdminRoleRepository::class);
+        $this->adminRepository     = $this->createStub(AdminRepository::class);
+        $this->adminRoleRepository = $this->createStub(AdminRoleRepository::class);
         $this->adminService        = new AdminService($this->adminRepository, $this->adminRoleRepository);
     }
 
diff --git a/test/Unit/App/Middleware/AuthenticationMiddlewareTest.php b/test/Unit/App/Middleware/AuthenticationMiddlewareTest.php
@@ -11,6 +11,7 @@
 use Mezzio\Authentication\UserInterface;
 use PHPUnit\Framework\MockObject\Exception;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -19,19 +20,19 @@
 class AuthenticationMiddlewareTest extends TestCase
 {
     private AuthenticationMiddleware $authenticationMiddleware;
-    private AuthenticationInterface&MockObject $auth;
+    private AuthenticationInterface&Stub $auth;
     private ServerRequestInterface $request;
     private RequestHandlerInterface&MockObject $handler;
-    private ResponseInterface&MockObject $response;
+    private ResponseInterface&Stub $response;
 
     /**
      * @throws Exception
      */
     public function setUp(): void
     {
-        $this->auth     = $this->createMock(AuthenticationInterface::class);
+        $this->auth     = $this->createStub(AuthenticationInterface::class);
         $this->handler  = $this->createMock(RequestHandlerInterface::class);
-        $this->response = $this->createMock(ResponseInterface::class);
+        $this->response = $this->createStub(ResponseInterface::class);
         $this->request  = new ServerRequest();
 
         $this->authenticationMiddleware = new AuthenticationMiddleware($this->auth);
diff --git a/test/Unit/App/Middleware/AuthorizationMiddlewareTest.php b/test/Unit/App/Middleware/AuthorizationMiddlewareTest.php
@@ -22,7 +22,7 @@
 use Mezzio\Authentication\UserInterface;
 use Mezzio\Authorization\AuthorizationInterface;
 use PHPUnit\Framework\MockObject\Exception;
-use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -33,23 +33,23 @@
 class AuthorizationMiddlewareTest extends TestCase
 {
     private AuthorizationMiddleware $authorizationMiddleware;
-    private UserRepository&MockObject $userRepository;
-    private AdminRepository&MockObject $adminRepository;
-    private AuthorizationInterface&MockObject $authorization;
+    private UserRepository&Stub $userRepository;
+    private AdminRepository&Stub $adminRepository;
+    private AuthorizationInterface&Stub $authorization;
     private ServerRequestInterface $request;
-    private RequestHandlerInterface&MockObject $handler;
-    private ResponseInterface $response;
+    private RequestHandlerInterface&Stub $handler;
+    private ResponseInterface&Stub $response;
 
     /**
      * @throws Exception
      */
     public function setUp(): void
     {
-        $this->userRepository  = $this->createMock(UserRepository::class);
-        $this->adminRepository = $this->createMock(AdminRepository::class);
-        $this->authorization   = $this->createMock(AuthorizationInterface::class);
-        $this->handler         = $this->createMock(RequestHandlerInterface::class);
-        $this->response        = $this->createMock(ResponseInterface::class);
+        $this->userRepository  = $this->createStub(UserRepository::class);
+        $this->adminRepository = $this->createStub(AdminRepository::class);
+        $this->authorization   = $this->createStub(AuthorizationInterface::class);
+        $this->handler         = $this->createStub(RequestHandlerInterface::class);
+        $this->response        = $this->createStub(ResponseInterface::class);
         $this->request         = new ServerRequest();
 
         $this->authorizationMiddleware = new AuthorizationMiddleware(
@@ -150,6 +150,9 @@ public function testAuthorizationNotGranted(): void
         );
     }
 
+    /**
+     * @throws Exception
+     */
     public function testAuthorizationAccessGranted(): void
     {
         $user = (new User())
@@ -162,7 +165,8 @@ public function testAuthorizationAccessGranted(): void
         $identity      = new UserIdentity('test@dotkernel.com', ['user'], ['oauth_client_id' => 'frontend']);
         $this->request = $this->request->withAttribute(UserInterface::class, $identity);
 
-        $this->handler
+        $handler = $this->createMock(RequestHandlerInterface::class);
+        $handler
             ->expects($this->once())
             ->method('handle')
             ->willReturnCallback(function (ServerRequestInterface $request) use ($identity) {
@@ -173,6 +177,6 @@ public function testAuthorizationAccessGranted(): void
                 return $this->response;
             });
 
-        $this->authorizationMiddleware->process($this->request, $this->handler);
+        $this->authorizationMiddleware->process($this->request, $handler);
     }
 }
diff --git a/test/Unit/App/Middleware/ContentNegotiationMiddlewareTest.php b/test/Unit/App/Middleware/ContentNegotiationMiddlewareTest.php
diff --git a/test/Unit/App/Middleware/DeprecationMiddlewareTest.php b/test/Unit/App/Middleware/DeprecationMiddlewareTest.php
diff --git a/test/Unit/App/Template/ParserTest.php b/test/Unit/App/Template/ParserTest.php
diff --git a/test/Unit/App/Template/RendererTest.php b/test/Unit/App/Template/RendererTest.php
diff --git a/test/Unit/CliTest.php b/test/Unit/CliTest.php
diff --git a/test/Unit/User/Service/UserAvatarServiceTest.php b/test/Unit/User/Service/UserAvatarServiceTest.php
diff --git a/test/Unit/User/Service/UserServiceTest.php b/test/Unit/User/Service/UserServiceTest.php

-Original file line number
+Diff line change
           - ubuntu-latest
         php:
 -          - "8.2"
           - "8.3"
           - "8.4"
           - "8.5"