Update openapi core implementation

Author: marcelthole

.github/workflows/build.yml

@@ -15,13 +15,11 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: "8.0"
+          - php-version: "8.1"
             composer-deps: lowest
-          - php-version: "8.0"
-            composer-deps: latest
-            with-cs-check: true
           - php-version: "8.1"
             composer-deps: latest
+            with-cs-check: true
           - php-version: "8.2"
             composer-deps: latest
           - php-version: "8.3"

.gitignore

@@ -3,3 +3,4 @@
 build
 !build/.gitkeep
 .idea
+.phpunit.cache

composer.json

@@ -14,16 +14,16 @@
     }
   ],
   "require": {
-    "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-    "cebe/php-openapi": "^1.7.0",
-    "symfony/console": "^5.1.9 || ^6.0"
+    "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+    "php-openapi/openapi": "^2.0",
+    "symfony/console": "^6.0 || ^7.0"
   },
   "require-dev": {
     "doctrine/coding-standard": "^12.0.0",
     "infection/infection": "^0.26.0",
     "phpstan/phpstan": "^1.10.0",
     "phpstan/phpstan-phpunit": "^1.3.0",
-    "phpunit/phpunit": "^9.5.0",
+    "phpunit/phpunit": "^10.0 || ^11.0",
     "roave/security-advisories": "dev-master"
   },
   "autoload": {

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.0-cli-alpine
+FROM php:8.3-cli-alpine
 
 RUN php --version
 

phpunit.xml.dist

@@ -1,41 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="./tests/bootstrap.php"
-         colors="true"
-         defaultTimeLimit="5"
-         executionOrder="random"
-         enforceTimeLimit="true"
-         beStrictAboutCoversAnnotation="true"
-         forceCoversAnnotation="true"
-         cacheResultFile="build/.phpunit.result.cache"
->
-
-    <php>
-        <ini name="assert.exception" value="1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Unit Test Suite">
-            <directory>./tests</directory>
-            <exclude>./tests/Acceptance</exclude>
-        </testsuite>
-        <testsuite name="Acceptance Test Suite">
-            <directory>./tests/Acceptance</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>./src</directory>
-        </include>
-        <report>
-            <clover outputFile="build/coverage/clover.xml"/>
-            <xml outputDirectory="build/coverage/coverage-xml/"/>
-        </report>
-    </coverage>
-
-    <logging>
-        <junit outputFile="build/coverage/junit.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="./tests/bootstrap.php" colors="true" defaultTimeLimit="5" executionOrder="random" enforceTimeLimit="true" cacheDirectory=".phpunit.cache" requireCoverageMetadata="true" beStrictAboutCoverageMetadata="true">
+  <php>
+    <ini name="assert.exception" value="1"/>
+  </php>
+  <testsuites>
+    <testsuite name="Unit Test Suite">
+      <directory>./tests</directory>
+      <exclude>./tests/Acceptance</exclude>
+    </testsuite>
+    <testsuite name="Acceptance Test Suite">
+      <directory>./tests/Acceptance</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="build/coverage/clover.xml"/>
+      <xml outputDirectory="build/coverage/coverage-xml/"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/coverage/junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </source>
 </phpunit>

src/FileHandling/SpecificationFile.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\FileHandling;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 
 final class SpecificationFile
 {

src/Merge/ComponentsMerger.php

@@ -4,8 +4,8 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\Components;
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\Components;
+use openapiphp\openapi\spec\OpenApi;
 use Mthole\OpenApiMerge\Util\Json;
 
 use function array_merge;

src/Merge/MergerInterface.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 
 interface MergerInterface
 {

src/Merge/PathMerger.php

@@ -4,8 +4,8 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\OpenApi;
-use cebe\openapi\spec\Paths;
+use openapiphp\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\Paths;
 use Mthole\OpenApiMerge\Util\Json;
 
 class PathMerger implements MergerInterface

src/Merge/ReferenceNormalizer.php

@@ -4,10 +4,10 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\MediaType;
-use cebe\openapi\spec\OpenApi;
-use cebe\openapi\spec\Reference;
-use cebe\openapi\spec\Response;
+use openapiphp\openapi\spec\MediaType;
+use openapiphp\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\Reference;
+use openapiphp\openapi\spec\Response;
 use Mthole\OpenApiMerge\FileHandling\File;
 
 use function array_map;
@@ -30,7 +30,7 @@ public function normalizeInlineReferences(
                 foreach ($operation->responses->getResponses() as $statusCode => $response) {
                     if ($response instanceof Reference) {
                         $operation->responses->addResponse(
-                            $statusCode,
+                            (string) $statusCode,
                             $this->normalizeReference($response, $refFileCollection),
                         );
                     }

src/Merge/ReferenceResolverResult.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 use Mthole\OpenApiMerge\FileHandling\File;
 
 final class ReferenceResolverResult

src/Merge/SecurityPathMerger.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Merge;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 use Mthole\OpenApiMerge\Util\Json;
 
 use function count;

src/Reader/FileReader.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Reader;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 use Mthole\OpenApiMerge\FileHandling\File;
 use Mthole\OpenApiMerge\FileHandling\SpecificationFile;
 use Mthole\OpenApiMerge\Reader\Exception\InvalidFileTypeException;

src/Reader/OpenApiReaderWrapper.php

@@ -4,8 +4,8 @@
 
 namespace Mthole\OpenApiMerge\Reader;
 
-use cebe\openapi\Reader;
-use cebe\openapi\SpecObjectInterface;
+use openapiphp\openapi\Reader;
+use openapiphp\openapi\SpecObjectInterface;
 
 class OpenApiReaderWrapper
 {

src/Writer/DefinitionWriter.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Writer;
 
-use cebe\openapi\Writer;
+use openapiphp\openapi\Writer;
 use Mthole\OpenApiMerge\FileHandling\SpecificationFile;
 use Mthole\OpenApiMerge\Writer\Exception\InvalidFileTypeException;
 

tests/Acceptance/ApplicationAcceptanceTest.php

@@ -12,7 +12,7 @@
 use function sprintf;
 use function version_compare;
 
-/** @coversNothing */
+#[\PHPUnit\Framework\Attributes\CoversNothing]
 class ApplicationAcceptanceTest extends TestCase
 {
     public function testApplicationRuns(): void

tests/AssertionsEnabledTest.php

@@ -9,7 +9,7 @@
 
 use function assert;
 
-/** @coversNothing */
+#[\PHPUnit\Framework\Attributes\CoversNothing]
 class AssertionsEnabledTest extends TestCase
 {
     public function testAssertionsWillThrowAnException(): void

tests/Console/Command/MergeCommandTest.php

@@ -4,7 +4,7 @@
 
 namespace Mthole\OpenApiMerge\Tests\Console\Command;
 
-use cebe\openapi\spec\OpenApi;
+use openapiphp\openapi\spec\OpenApi;
 use Generator;
 use Mthole\OpenApiMerge\Console\Command\MergeCommand;
 use Mthole\OpenApiMerge\FileHandling\File;
@@ -23,15 +23,13 @@
 
 use const PHP_EOL;
 
-/**
- * @uses \Mthole\OpenApiMerge\FileHandling\File
- * @uses \Mthole\OpenApiMerge\FileHandling\SpecificationFile
- *
- * @covers \Mthole\OpenApiMerge\Console\Command\MergeCommand
- */
+
+#[\PHPUnit\Framework\Attributes\CoversClass(\Mthole\OpenApiMerge\Console\Command\MergeCommand::class)]
+#[\PHPUnit\Framework\Attributes\UsesClass('\Mthole\OpenApiMerge\FileHandling\File')]
+#[\PHPUnit\Framework\Attributes\UsesClass('\Mthole\OpenApiMerge\FileHandling\SpecificationFile')]
 class MergeCommandTest extends TestCase
 {
-    /** @dataProvider invalidArgumentsDataProvider */
+    #[\PHPUnit\Framework\Attributes\DataProvider('invalidArgumentsDataProvider')]
     public function testRunWithInvalidArguments(ArrayInput $input): void
     {
         $sut = new MergeCommand(
@@ -47,7 +45,7 @@ public function testRunWithInvalidArguments(ArrayInput $input): void
     }
 
     /** @return Generator<list<ArrayInput>> */
-    public function invalidArgumentsDataProvider(): Generator
+    public static function invalidArgumentsDataProvider(): Generator
     {
         yield [
             new ArrayInput([
@@ -101,7 +99,7 @@ public function testRun(): void
 
         $mergeResultStub = new SpecificationFile(
             new File('dummy'),
-            $this->createStub(OpenApi::class),
+            new OpenApi([]),
         );
 
         $mergeMock = $this->createMock(OpenApiMergeInterface::class);
@@ -181,7 +179,7 @@ public function mergeFiles(
     }
 
     /** @return array<string, list<mixed>> */
-    public function resolveReferenceArgumentDataProvider(): iterable
+    public static function resolveReferenceArgumentDataProvider(): iterable
     {
         yield 'default-param' => [null, true];
         yield 'one as string' => ['1', true];
@@ -190,7 +188,7 @@ public function resolveReferenceArgumentDataProvider(): iterable
         yield 'false' => [false, false];
     }
 
-    /** @dataProvider resolveReferenceArgumentDataProvider */
+    #[\PHPUnit\Framework\Attributes\DataProvider('resolveReferenceArgumentDataProvider')]
     public function testResolveReferencesArgument(
         string|bool|null $resolveReferenceValue,
         bool $expectedResolveReferenceValue,
@@ -236,9 +234,8 @@ public function write(SpecificationFile $specFile): string
     /**
      * @param array<string, list<string>> $arguments
      * @param list<File>                  $expectedFiles
-     *
-     * @dataProvider matchArgumentDataProvider
      */
+    #[\PHPUnit\Framework\Attributes\DataProvider('matchArgumentDataProvider')]
     public function testMatchArgument(array $arguments, array $expectedFiles): void
     {
         $basefile = 'basefile.yml';
@@ -269,7 +266,7 @@ public function find(string $baseDirectory, string $searchString): array
     }
 
     /** @return iterable<string, array<string, mixed>> */
-    public function matchArgumentDataProvider(): iterable
+    public static function matchArgumentDataProvider(): iterable
     {
         yield 'given additional files with match should ignore match' => [
             'arguments' => [

tests/FileHandling/Exception/IOExceptionTest.php

@@ -7,7 +7,7 @@
 use Mthole\OpenApiMerge\FileHandling\Exception\IOException;
 use PHPUnit\Framework\TestCase;
 
-/** @covers \Mthole\OpenApiMerge\FileHandling\Exception\IOException */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Mthole\OpenApiMerge\FileHandling\Exception\IOException::class)]
 class IOExceptionTest extends TestCase
 {
     public function testCreateException(): void

tests/FileHandling/FileTest.php

@@ -12,22 +12,20 @@
 use function preg_quote;
 use function str_replace;
 
-/**
- * @uses   \Mthole\OpenApiMerge\FileHandling\Exception\IOException
- *
- * @covers \Mthole\OpenApiMerge\FileHandling\File
- */
+
+#[\PHPUnit\Framework\Attributes\CoversClass(\Mthole\OpenApiMerge\FileHandling\File::class)]
+#[\PHPUnit\Framework\Attributes\UsesClass('\Mthole\OpenApiMerge\FileHandling\Exception\IOException')]
 class FileTest extends TestCase
 {
-    /** @dataProvider fileExtensionProvider */
+    #[\PHPUnit\Framework\Attributes\DataProvider('fileExtensionProvider')]
     public function testGetFileExtension(string $filename, string $expectedExtension): void
     {
         $sut = new File($filename);
         self::assertSame($expectedExtension, $sut->getFileExtension());
     }
 
     /** @return list<list<string>> */
-    public function fileExtensionProvider(): iterable
+    public static function fileExtensionProvider(): iterable
     {
         yield ['base.yml', 'yml'];
         yield ['base.yaml', 'yaml'];

tests/FileHandling/RegexFinderTest.php

@@ -9,10 +9,10 @@
 
 use function array_keys;
 
-/** @covers \Mthole\OpenApiMerge\FileHandling\RegexFinder */
+#[\PHPUnit\Framework\Attributes\CoversClass(\Mthole\OpenApiMerge\FileHandling\RegexFinder::class)]
 class RegexFinderTest extends TestCase
 {
-    /** @dataProvider findStringDataProvider */
+    #[\PHPUnit\Framework\Attributes\DataProvider('findStringDataProvider')]
     public function testFind(string $search, int $expectedFilesCount): void
     {
         $sut   = new RegexFinder();
@@ -24,7 +24,7 @@ public function testFind(string $search, int $expectedFilesCount): void
     }
 
     /** @return array<string, array<string|int>> */
-    public function findStringDataProvider(): iterable
+    public static function findStringDataProvider(): iterable
     {
         yield 'all a.txt' => ['.*a.txt', 2];
         yield 'all a.txt in B' => ['B/a.txt', 1];