Merge pull request #390 from Art4/389-update-to-redmine-508-and-512-in-tests

Update all dependencies

Author: Art4

.docker/PHP83-Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3.1-fpm
+FROM php:8.3.3-fpm
 
 RUN apt-get update
 RUN apt-get --yes --no-install-recommends install \

.github/workflows/tests.yml

@@ -77,7 +77,7 @@ jobs:
 
       - name: Upload coverage reports to Codecov
         if: ${{ matrix.tool == 'code-coverage' }}
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./.phpunit.cache/clover.xml

composer.json

@@ -34,7 +34,7 @@
         "guzzlehttp/psr7": "^2",
         "php-mock/php-mock-phpunit": "^2.6",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9 || ^10.5"
+        "phpunit/phpunit": "^9.5 || ^10.5"
     },
     "autoload": {
         "psr-4": {

docker-compose.yml

@@ -13,7 +13,7 @@ services:
             - ./:/var/www/project/ # Location of the project for php-fpm. Note this should be the same for NGINX.*
 
     redmine-dev:
-        image: redmine:5.1.1
+        image: redmine:5.1.2
         user: "1000:1000"
         ports:
             - "3000:3000"
@@ -26,26 +26,26 @@ services:
 
     # Make sure the following services are supported in /tests/RedmineExtension/RedmineInstance.php
 
-    redmine-50101:
-        image: redmine:5.1.1
+    redmine-50102:
+        image: redmine:5.1.2
         user: "1000:1000"
         ports:
             - "5101:3000"
         environment:
             REDMINE_SECRET_KEY_BASE: supersecretkey
             REDMINE_PLUGINS_MIGRATE: true
         volumes:
-            - ./.docker/redmine-50101_data/files:/usr/src/redmine/files
-            - ./.docker/redmine-50101_data/sqlite:/usr/src/redmine/sqlite
+            - ./.docker/redmine-50102_data/files:/usr/src/redmine/files
+            - ./.docker/redmine-50102_data/sqlite:/usr/src/redmine/sqlite
 
-    redmine-50007:
-        image: redmine:5.0.7
+    redmine-50008:
+        image: redmine:5.0.8
         user: "1000:1000"
         ports:
             - "5007:3000"
         environment:
             REDMINE_SECRET_KEY_BASE: supersecretkey
             REDMINE_PLUGINS_MIGRATE: true
         volumes:
-            - ./.docker/redmine-50007_data/files:/usr/src/redmine/files
-            - ./.docker/redmine-50007_data/sqlite:/usr/src/redmine/sqlite
+            - ./.docker/redmine-50008_data/files:/usr/src/redmine/files
+            - ./.docker/redmine-50008_data/sqlite:/usr/src/redmine/sqlite

tests/Behat/behat.yml

@@ -1,14 +1,14 @@
 default:
     suites:
-        redmine_50101:
+        redmine_50102:
             paths:
                 - '%paths.base%/features'
             contexts:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
-                    redmineVersion: '5.1.1'
-        redmine_50007:
+                    redmineVersion: '5.1.2'
+        redmine_50008:
             paths:
                 - '%paths.base%/features'
             contexts:
                 - Redmine\Tests\Behat\Bootstrap\FeatureContext:
-                    redmineVersion: '5.0.7'
+                    redmineVersion: '5.0.8'

tests/Fixtures/AssertingHttpClient.php

@@ -4,6 +4,8 @@
 
 namespace Redmine\Tests\Fixtures;
 
+use PHPUnit\Framework\MockObject\MockBuilder;
+use PHPUnit\Framework\MockObject\Rule\InvokedCount;
 use PHPUnit\Framework\TestCase;
 use Redmine\Http\HttpClient;
 use Redmine\Http\Request;
@@ -21,8 +23,8 @@ public static function create(TestCase $testCase, array $dataSet, ...$dataSets):
         $dataSets = array_merge([$dataSet], $dataSets);
 
         /** @var \PHPUnit\Framework\MockObject\MockObject&HttpClient */
-        $mock = $testCase->getMockBuilder(HttpClient::class)->getMock();
-        $mock->expects($testCase->exactly(count($dataSets)))->method('request');
+        $mock = (new MockBuilder($testCase, HttpClient::class))->getMock();
+        $mock->expects(new InvokedCount(count($dataSets)))->method('request');
 
         $client = new self($testCase, $mock);
 
@@ -95,7 +97,7 @@ public function request(Request $request): Response
         }
 
         /** @var \PHPUnit\Framework\MockObject\MockObject&Response */
-        $response = $this->testCase->getMockBuilder(Response::class)->getMock();
+        $response = (new MockBuilder($this->testCase, Response::class))->getMock();
 
         $response->method('getStatusCode')->willReturn($data['responseCode']);
         $response->method('getContentType')->willReturn($data['responseContentType']);

tests/Integration/Psr18ClientRequestGenerationTest.php

@@ -6,6 +6,8 @@
 
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Utils;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
@@ -14,14 +16,13 @@
 use Psr\Http\Message\StreamInterface;
 use Redmine\Client\Psr18Client;
 
+#[CoversClass(Psr18Client::class)]
 class Psr18ClientRequestGenerationTest extends TestCase
 {
     /**
-     * @covers \Redmine\Client\Psr18Client
-     * @test
-     *
      * @dataProvider createdGetRequestsData
      */
+    #[DataProvider('createdGetRequestsData')]
     public function testPsr18ClientCreatesCorrectRequests(
         string $url,
         string $apikeyOrUsername,
@@ -34,42 +35,39 @@ public function testPsr18ClientCreatesCorrectRequests(
     ) {
         $response = $this->createMock(ResponseInterface::class);
 
+        /** @var ClientInterface|\PHPUnit\Framework\MockObject\MockObject */
         $httpClient = $this->createMock(ClientInterface::class);
-        $httpClient->method('sendRequest')->will(
-            $this->returnCallback(function ($request) use ($response, $expectedOutput) {
-                // Create a text representation of the HTTP request
-                $content = $request->getBody()->__toString();
+        $httpClient->method('sendRequest')->willReturnCallback(function ($request) use ($response, $expectedOutput) {
+            // Create a text representation of the HTTP request
+            $content = $request->getBody()->__toString();
 
-                $headers = '';
+            $headers = '';
 
-                foreach ($request->getHeaders() as $k => $v) {
-                    $headers .= $k . ': ' . $request->getHeaderLine($k) . \PHP_EOL;
-                }
+            foreach ($request->getHeaders() as $k => $v) {
+                $headers .= $k . ': ' . $request->getHeaderLine($k) . \PHP_EOL;
+            }
 
-                $statusLine = sprintf(
-                    '%s %s HTTP/%s',
-                    $request->getMethod(),
-                    $request->getUri()->__toString(),
-                    $request->getProtocolVersion()
-                );
+            $statusLine = sprintf(
+                '%s %s HTTP/%s',
+                $request->getMethod(),
+                $request->getUri()->__toString(),
+                $request->getProtocolVersion()
+            );
 
-                $fullRequest = $statusLine . \PHP_EOL .
-                    $headers . \PHP_EOL .
-                    $content
-                ;
+            $fullRequest = $statusLine . \PHP_EOL .
+                $headers . \PHP_EOL .
+                $content
+            ;
 
-                $this->assertSame($expectedOutput, $fullRequest);
+            $this->assertSame($expectedOutput, $fullRequest);
 
-                return $response;
-            })
-        );
+            return $response;
+        });
 
         $requestFactory = $this->createMock(RequestFactoryInterface::class);
-        $requestFactory->method('createRequest')->will(
-            $this->returnCallback(function ($method, $uri) {
-                return new Request($method, $uri);
-            })
-        );
+        $requestFactory->method('createRequest')->willReturnCallback(function ($method, $uri) {
+            return new Request($method, $uri);
+        });
 
         $streamFactory = new class () implements StreamFactoryInterface {
             public function createStream(string $content = ''): StreamInterface

tests/RedmineExtension/RedmineInstance.php

@@ -16,8 +16,8 @@ final class RedmineInstance
     public static function getSupportedVersions(): array
     {
         return [
-            RedmineVersion::V5_1_1,
-            RedmineVersion::V5_0_7,
+            RedmineVersion::V5_1_2,
+            RedmineVersion::V5_0_8,
         ];
     }
 

tests/RedmineExtension/RedmineVersion.php

@@ -6,6 +6,14 @@
 
 enum RedmineVersion: string
 {
+    /**
+     * Redmine 5.1.2
+     *
+     * @link https://www.redmine.org/versions/193
+     * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_1#512-2024-03-04
+     */
+    case V5_1_2 = '5.1.2';
+
     /**
      * Redmine 5.1.1
      *
@@ -22,6 +30,15 @@ enum RedmineVersion: string
      */
     case V5_1_0 = '5.1.0';
 
+    /**
+     * Redmine 5.0.8
+     *
+     * @link https://www.redmine.org/versions/192
+     * @link https://www.redmine.org/projects/redmine/wiki/Changelog_5_0#508-2024-03-04
+     */
+
+    case V5_0_8 = '5.0.8';
+
     /**
      * Redmine 5.0.7
      *

tests/Unit/Api/AbstractApi/DeleteTest.php

@@ -4,15 +4,15 @@
 
 namespace Redmine\Tests\Unit\Api\AbstractApi;
 
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Redmine\Api\AbstractApi;
 use Redmine\Client\Client;
 use Redmine\Tests\Fixtures\AssertingHttpClient;
 use ReflectionMethod;
 
-/**
- * @covers \Redmine\Api\AbstractApi::delete
- */
+#[CoversClass(AbstractApi::class)]
 class DeleteTest extends TestCase
 {
     public function testDeleteWithHttpClient()
@@ -44,6 +44,7 @@ public function testDeleteWithHttpClient()
     /**
      * @dataProvider getXmlDecodingFromDeleteMethodData
      */
+    #[DataProvider('getXmlDecodingFromDeleteMethodData')]
     public function testXmlDecodingFromDeleteMethod($response, $expected)
     {
         $client = $this->createMock(Client::class);