chubbyphp-mock-2.x

Author: dominikzogg

Diff for: .github/workflows/ci.yml

@@ -108,7 +108,7 @@ jobs:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
       - name: sonarcloud.io
-        uses: sonarsource/sonarqube-scan-action@v4.2.1
+        uses: sonarsource/sonarqube-scan-action@v5.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Diff for: composer.json

@@ -34,12 +34,13 @@
     },
     "require-dev": {
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-mock": "^1.8",
-        "infection/infection": "^0.29.10",
+        "chubbyphp/chubbyphp-mock": "^2.0@dev",
+        "dg/bypass-finals": "^1.9",
+        "infection/infection": "^0.29.13",
         "php-coveralls/php-coveralls": "^2.7",
         "phpstan/extension-installer": "^1.4.3",
-        "phpstan/phpstan": "^2.1.3",
-        "phpunit/phpunit": "^11.5.7"
+        "phpstan/phpstan": "^2.1.6",
+        "phpunit/phpunit": "^11.5.10"
     },
     "autoload": {
         "psr-4": {

Diff for: phpunit.xml

@@ -15,4 +15,9 @@
       <file>./src/web.php</file>
     </exclude>
   </source>
+  <extensions>
+    <bootstrap class="DG\BypassFinals\PHPUnitExtension">
+      <parameter name="bypassFinal" value="true"/>
+    </bootstrap>
+  </extensions>
 </phpunit>

Diff for: src/RequestHandler/PingRequestHandler.php

@@ -25,7 +25,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         ;
 
         /** @var non-empty-string $json */
-        $json = json_encode(['date' => date('c')]);
+        $json = json_encode(['datetime' => date('c')]);
 
         $response->getBody()->write($json);
 

Diff for: tests/Integration/PingRequestHandlerTest.php

@@ -32,9 +32,9 @@ public function testPing(): void
 
         $ping = json_decode($response['body'], true, 512, JSON_THROW_ON_ERROR);
 
-        self::assertArrayHasKey('date', $ping);
+        self::assertArrayHasKey('datetime', $ping);
 
-        $date = new \DateTimeImmutable($ping['date']);
+        $date = new \DateTimeImmutable($ping['datetime']);
 
         self::assertGreaterThanOrEqual($now, $date);
     }

Diff for: tests/Unit/Collection/CollectionTest.php

@@ -7,8 +7,8 @@
 use App\Collection\AbstractCollection;
 use App\Collection\CollectionInterface;
 use App\Model\ModelInterface;
-use Chubbyphp\Mock\Call;
-use Chubbyphp\Mock\MockByCallsTrait;
+use Chubbyphp\Mock\MockMethod\WithReturn;
+use Chubbyphp\Mock\MockObjectBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -19,8 +19,6 @@
  */
 class CollectionTest extends TestCase
 {
-    use MockByCallsTrait;
-
     public function testGetSet(): void
     {
         $collection = $this->getCollection();
@@ -32,9 +30,15 @@ public function testGetSet(): void
         self::assertSame(0, $collection->getCount());
         self::assertSame([], $collection->getItems());
 
+        $builder = new MockObjectBuilder();
+
         /** @var MockObject|ModelInterface $model */
-        $model = $this->getMockByCalls(ModelInterface::class, [
-            Call::create('jsonSerialize')->with()->willReturn(['id' => '111d1691-8486-4447-997c-d10ce35d1fea']),
+        $model = $builder->create(ModelInterface::class, [
+            new WithReturn(
+                'jsonSerialize',
+                [],
+                ['id' => '111d1691-8486-4447-997c-d10ce35d1fea']
+            ),
         ]);
 
         $collection->setOffset(5);