Fix remove disappeared dependency

.gitattributes

@@ -0,0 +1,10 @@
+/.github             export-ignore
+/tests               export-ignore
+.gitattributes       export-ignore
+.gitignore           export-ignore
+.php_cs.dist         export-ignore
+docker-compose.yml   export-ignore
+Makefile             export-ignore
+phpunit.xml.dist     export-ignore
+phpunit11.xml.dist   export-ignore
+yarn.lock           export-ignore

.github/workflows/php.yml

@@ -20,10 +20,12 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.3"
+          - "8.4"
         dependencies:
           - "lowest"
           - "highest"
-        symfony-yaml: ['^3.4', '^4', '^5', '^6']
+        symfony-yaml: ['^3.4', '^4', '^5', '^6', '^7', '^8']
         include:
           - os: "windows-latest"
             php: "8.0"
@@ -46,11 +48,45 @@ jobs:
             symfony-yaml: '^6'
           - php: '7.4'
             symfony-yaml: '^6'
+          # symfony/yaml v7 does not run on PHP 7.*
+          - php: '7.1'
+            symfony-yaml: '^7'
+          - php: '7.2'
+            symfony-yaml: '^7'
+          - php: '7.3'
+            symfony-yaml: '^7'
+          - php: '7.4'
+            symfony-yaml: '^7'
+          # symfony/yaml v7 does not run on PHP 8.0 & 8.1
+          - php: '8.0'
+            symfony-yaml: '^7'
+          - php: '8.1'
+            symfony-yaml: '^7'
+          # symfony/yaml v8 does not run on PHP 7.*
+          - php: '7.1'
+            symfony-yaml: '^8'
+          - php: '7.2'
+            symfony-yaml: '^8'
+          - php: '7.3'
+            symfony-yaml: '^8'
+          - php: '7.4'
+            symfony-yaml: '^8'
+          # symfony/yaml v8 does not run on PHP < 8.4
+          - php: '8.0'
+            symfony-yaml: '^8'
+          - php: '8.1'
+            symfony-yaml: '^8'
+          - php: '8.3'
+            symfony-yaml: '^8'
           # symfony/yaml v3.4 is not compatible with PHP 8.0 but has no upper-bound, so it installs on it
           - php: '8.0'
             symfony-yaml: '^3.4'
           - php: '8.1'
             symfony-yaml: '^3.4'
+          - php: '8.3'
+            symfony-yaml: '^3.4'
+          - php: '8.4'
+            symfony-yaml: '^3.4'
 
     runs-on: ${{ matrix.os }}
 
@@ -71,6 +107,10 @@ jobs:
         run: "composer require phpunit/phpunit '^9.5' --dev --no-interaction --ansi --no-install"
         if: matrix.php == '8.1'
 
+      - name: Require newer phpunit/phpunit version
+        run: "composer require phpunit/phpunit '^11.4' --dev --no-interaction --ansi --no-install"
+        if: matrix.php >= '8.3'
+
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v2"
         with:
@@ -81,6 +121,11 @@ jobs:
 
       - name: PHPUnit tests
         run: make test
+        if: matrix.php < '8.3'
+
+      - name: PHPUnit tests
+        run: make test-debug
+        if: matrix.php >= '8.3'
 
       - name: Code coverage
         run: make coverage

.gitignore

@@ -6,5 +6,6 @@
 
 /.php_cs.cache
 /.phpunit.result.cache
-
+/.idea
+xdebug_remote.log
 php-cs-fixer.phar

Makefile

@@ -11,8 +11,8 @@ DOCKER_PHP=
 DOCKER_NODE=
 IN_DOCKER=0
 ifeq ($(IN_DOCKER),1)
-DOCKER_PHP=docker-compose run --rm php
-DOCKER_NODE=docker-compose run --rm -w /app node
+DOCKER_PHP=docker compose run --rm php
+DOCKER_NODE=docker compose run --rm -w /app node
 endif
 
 all:
@@ -46,6 +46,11 @@ test: unit test-recursion.json test-recursion2.yaml test-recursion3_index.yaml t
 unit:
 	$(DOCKER_PHP) php $(PHPARGS) $(XPHPARGS) vendor/bin/phpunit --verbose --colors=always $(TESTCASE)
 
+test-debug: unit-debug test-recursion.json test-recursion2.yaml test-recursion3_index.yaml test-empty-maps.json
+
+unit-debug:
+	$(DOCKER_PHP) php $(PHPARGS) $(XPHPARGS) vendor/bin/phpunit --debug --testdox --colors=always -c phpunit11.xml.dist $(TESTCASE)
+
 # test specific JSON files in tests/spec/data/
 # e.g. test-recursion will run validation on tests/spec/data/recursion.json
 test-%: tests/spec/data/%
@@ -62,13 +67,6 @@ lint: install
 stan:
 	$(DOCKER_PHP) php $(PHPARGS) vendor/bin/phpstan analyse -l 5 src
 
-# copy openapi3 json schema
-schemas/openapi-v3.0.json: vendor/oai/openapi-specification/schemas/v3.0/schema.json
-	cp $< $@
-
-schemas/openapi-v3.0.yaml: vendor/oai/openapi-specification/schemas/v3.0/schema.yaml
-	cp $< $@
-
 php-cs-fixer.phar:
 	wget -q https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.7/php-cs-fixer.phar && chmod +x php-cs-fixer.phar
 

README.md

@@ -1,17 +1,26 @@
+## Atention
+This is a fork of [cebe/php-openapi](https://github.com/cebe/php-openapi). I created it as library because the pull request
+of the openapi3.1 was taking years and a lot of developers want to use it.
+
 # php-openapi
 
-Read and write [OpenAPI](https://www.openapis.org/) 3.0.x YAML and JSON files and make the content accessible in PHP objects.
+Read and write [OpenAPI](https://www.openapis.org/) 3.x YAML and JSON files and make the content accessible in PHP objects.
+
+It also provides a CLI tool for validating and converting OpenAPI 3.x Description files.
+
+Supported OpenAPI versions:
 
-It also provides a CLI tool for validating and converting OpenAPI 3.0.x Description files.
+- 3.0.x
+- 3.1.x
 
-[![Latest Stable Version](https://poser.pugx.org/cebe/php-openapi/v/stable)](https://packagist.org/packages/cebe/php-openapi)
-[![Total Downloads](https://poser.pugx.org/cebe/php-openapi/downloads)](https://packagist.org/packages/cebe/php-openapi)
-[![Build Status](https://github.com/cebe/php-openapi/workflows/CI/badge.svg)](https://github.com/cebe/php-openapi/actions)
+[![Latest Stable Version](https://poser.pugx.org/devizzent/cebe-php-openapi/v/stable)](https://packagist.org/packages/devizzent/cebe-php-openapi)
+[![Total Downloads](https://poser.pugx.org/devizzent/cebe-php-openapi/downloads)](https://packagist.org/packages/devizzent/cebe-php-openapi)
+[![Build Status](https://github.com/devizzent/cebe-php-openapi/workflows/CI/badge.svg)](https://github.com/devizzent/cebe-php-openapi/actions)
 
 
 ## Install
 
-    composer require cebe/php-openapi
+    composer require devizzent/cebe-php-openapi
 
 ## Requirements
 
@@ -22,11 +31,7 @@ It also provides a CLI tool for validating and converting OpenAPI 3.0.x Descript
 This library provides a low level API for reading and writing OpenAPI files. It is used by higher level tools to
 do awesome work:
 
-- [cebe/yii2-openapi](https://github.com/cebe/yii2-openapi) Code Generator for REST API from OpenAPI 3 Descriptions, includes fake data generator.
-- [cebe/yii2-app-api](https://github.com/cebe/yii2-app-api) Yii framework application template for developing API-first applications.
-- [league/openapi-psr7-validator](https://github.com/thephpleague/openapi-psr7-validator) validates PSR-7 messages (HTTP request/response) against OpenAPI descriptions.
-- [dsuurlant/response2schema](https://github.com/dsuurlant/response2schema) a quick and easy tool for generating OpenAPI schemas based on example data.
-- ... ([add yours](https://github.com/cebe/php-openapi/edit/master/README.md#L24))
+- ... ([add yours](https://github.com/devizzent/cebe-php-openapi/edit/master/README.md#L24))
 
 ## Usage
 
@@ -222,7 +227,7 @@ $openapi->resolveReferences(
 
 The library provides simple validation operations, that check basic OpenAPI spec requirements.
 This is the same as "structural errors found while reading the API Description file" from the CLI tool.
-This validation does not include checking against the OpenAPI v3.0 JSON schema, this is only implemented in the CLI.
+This validation does not include checking against the OpenAPI v3.0/v3.1 JSON schemas, this is only implemented in the CLI.
 
 ```
 // return `true` in case no errors have been found, `false` in case of errors.
@@ -235,48 +240,6 @@ $errors = $openapi->getErrors();
 > but the list of errors given may not be complete. Also a passing validation does not necessarily indicate a completely
 > valid spec.
 
-
-## Completeness
-
-This library is currently work in progress, the following list tracks completeness:
-
-- [x] read OpenAPI 3.0 JSON
-- [x] read OpenAPI 3.0 YAML
-- [ ] OpenAPI 3.0 Schema
-  - [x] OpenAPI Object
-  - [x] Info Object
-  - [x] Contact Object
-  - [x] License Object
-  - [x] Server Object
-  - [x] Server Variable Object
-  - [x] Components Object
-  - [x] Paths Object
-  - [x] Path Item Object
-  - [x] Operation Object
-  - [x] External Documentation Object
-  - [x] Parameter Object
-  - [x] Request Body Object
-  - [x] Media Type Object
-  - [x] Encoding Object
-  - [x] Responses Object
-  - [x] Response Object
-  - [x] Callback Object
-  - [x] Example Object
-  - [x] Link Object
-    - [ ] [Runtime Expressions](https://github.com/OAI/OpenAPI-Specification/blob/3.0.2/versions/3.0.2.md#runtime-expressions)
-  - [x] Header Object
-  - [x] Tag Object
-  - [x] Reference Object
-  - [x] Schema Object
-    - [x] load/read
-    - [ ] validation
-  - [x] Discriminator Object
-  - [x] XML Object
-  - [x] Security Scheme Object
-  - [x] OAuth Flows Object
-  - [x] OAuth Flow Object
-  - [x] Security Requirement Object
-
 # Development
 
 You may use the docker environment for local development:
@@ -286,13 +249,3 @@ You may use the docker environment for local development:
     make IN_DOCKER=1 test
     ...
 
-
-# Support
-
-**Need help with your API project?**
-
-Professional support, consulting as well as software development services are available:
-
-https://www.cebe.cc/en/contact
-
-Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).

bin/php-openapi

@@ -131,16 +131,22 @@ switch ($command) {
 
         // Validate
 
+        // OpenAPI version check
+        $openApiVersion = $openApi->getMajorVersion();
+        if ($openApiVersion === \cebe\openapi\spec\OpenApi::VERSION_UNSUPPORTED) {
+            error("Unsupported OpenAPI version: " . $openApi->openapi);
+        }
+
         $openApi->validate();
         $errors = array_merge($errors, $openApi->getErrors());
 
         $validator = new JsonSchema\Validator;
         $openApiData = $openApi->getSerializableData();
-        $validator->validate($openApiData, (object)['$ref' => 'file://' . dirname(__DIR__) . '/schemas/openapi-v3.0.json']);
+        $validator->validate($openApiData, (object)['$ref' => 'file://' . dirname(__DIR__) . "/schemas/openapi-v{$openApiVersion}.json"]);
 
         if ($validator->isValid() && empty($errors)) {
             if(!$silentMode) {
-                print_formatted("The supplied API Description \B\Gvalidates\C against the OpenAPI v3.0 schema.\n", STDERR);
+                print_formatted("The supplied API Description \B\Gvalidates\C against the OpenAPI v{$openApiVersion} schema.\n", STDERR);
             }
             exit(0);
         }
@@ -163,7 +169,7 @@ switch ($command) {
             }
         }
         if (!$validator->isValid()) {
-            print_formatted("\BOpenAPI v3.0 schema violations:\C\n", STDERR);
+            print_formatted("\BOpenAPI v{$openApiVersion} schema violations:\C\n", STDERR);
             $errors = $validator->getErrors();
             foreach ($errors as $error) {
                 // hide some errors triggered by other errors further down the path