Merge pull request #22 from membrane-php/use-devizzent-fork

Use devizzent/cebe-php-openapi

Author: carnage

composer.json

@@ -16,7 +16,7 @@
   },
   "require": {
     "php": "^8.1.0",
-    "cebe/php-openapi": "^1.7"
+    "devizzent/cebe-php-openapi": "^1.1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^10.5.36",

src/Exception/InvalidOpenAPI.php

@@ -301,6 +301,16 @@ public static function invalidType(Identifier $identifier, string $type): self
         return new self($message);
     }
 
+    public static function typeArrayInWrongVersion(Identifier $identifier): self
+    {
+        $message = <<<TEXT
+            $identifier
+            Specifying type as an array is only valid for OpenAPI ^3.1
+            TEXT;
+
+        return new self($message);
+    }
+
     public static function failedCebeValidation(string ...$errors): self
     {
         $message = sprintf("OpenAPI is invalid for the following reasons:\n\t- %s", implode("\n\t- ", $errors));

src/ValueObject/Partial/Schema.php

@@ -7,12 +7,13 @@
 final class Schema
 {
     /**
+     * @param array<string>|string|null $type
      * @param ?self[] $allOf
      * @param ?self[] $anyOf
      * @param ?self[] $oneOf
      */
     public function __construct(
-        public ?string $type = null,
+        public array|string|null $type = null,
         public ?array $allOf = null,
         public ?array $anyOf = null,
         public ?array $oneOf = null,

src/ValueObject/Valid/V30/Schema.php

@@ -91,12 +91,17 @@ public function __construct(
         }
     }
 
-    private function validateType(Identifier $identifier, ?string $type): ?Type
+    /** @param array<string>|string|null $type */
+    private function validateType(Identifier $identifier, array|string|null $type): ?Type
     {
         if (is_null($type)) {
             return null;
         }
 
+        if (is_array($type)) {
+            return throw InvalidOpenAPI::typeArrayInWrongVersion($this->getIdentifier());
+        }
+
         return Type::tryFromVersion(
             OpenAPIVersion::Version_3_0,
             $type