In progress

Author: SOHELAHMED7

src/lib/openapi/PropertySchema.php

@@ -70,6 +70,7 @@ class PropertySchema
 
     /** @var string $refPointer */
     private $refPointer;
+    private $uri;
 
     /** @var \cebe\yii2openapi\lib\openapi\ComponentSchema $refSchema */
     private $refSchema;
@@ -170,6 +171,7 @@ private function initReference():void
     {
         $this->isReference = true;
         $this->refPointer = $this->property->getJsonReference()->getJsonPointer()->getPointer();
+        $this->uri = $this->property->getJsonReference()->getDocumentUri();
         $refSchemaName = $this->getRefSchemaName();
         if ($this->isRefPointerToSelf()) {
             $this->refSchema = $this->schema;
@@ -194,6 +196,7 @@ private function initItemsReference():void
             return;
         }
         $this->refPointer = $items->getJsonReference()->getJsonPointer()->getPointer();
+        $this->uri = $this->property->getJsonReference()->getDocumentUri();
         if ($this->isRefPointerToSelf()) {
             $this->refSchema = $this->schema;
         } elseif ($this->isRefPointerToSchema()) {
@@ -301,8 +304,15 @@ public function getRefSchemaName():string
             '~^'.self::REFERENCE_PATH.'(?<schemaName>.+)/properties/(?<propName>.+)$~'
             : '~^'.self::REFERENCE_PATH.'(?<schemaName>.+)$~';
         if (!\preg_match($pattern, $this->refPointer, $matches)) {
-            throw new InvalidDefinitionException('Invalid schema reference');
+            $pattern = '/((\.\/)*)(?<schemaName>.+)(\.)(yml|yaml)(.*)/';
+//            $pattern = '~^(?<schemaName>.+)(\.+)(yaml+)(.*)$~';
+            if (strpos($this->uri, '#') !== false && !\preg_match($pattern, $this->uri, $matches)) {
+//                throw new InvalidDefinitionException('Invalid schema reference');
+            } else {
+                throw new InvalidDefinitionException('Invalid schema reference');
+            }
         }
+        var_dump($matches);
         return $matches['schemaName'];
     }
 

tests/specs/issue_fix/74_invalid_schema_reference_error/index.yaml

@@ -17,7 +17,7 @@ components:
         id:
           type: integer
         vat_rate:
-          # $ref: '#/components/schemas/Product/properties/vat_rate' # issue is not observed
+          #           $ref: '#/components/schemas/Product/properties/vat_rate' # issue is not observed
           $ref: './Product.yaml#/properties/vat_rate'  # issue is observed
     Product:
       type: object

tests/unit/IssueFixTest.php

@@ -966,6 +966,14 @@ public function test63JustColumnNameRename()
     // https://github.com/php-openapi/yii2-openapi/issues/63
     public function test74InvalidSchemaReferenceError()
     {
+//        $pattern = '~^(?<schemaName>.+)(\.+)(yaml+)(.*)$~';
+//        $pattern = '/((\.\/)*)(?<schemaName>.+)(\.)(yml|yaml)(.*)/';
+//
+//        $pointer = './Product.yaml#/properties/vat_rate';
+//        preg_match($pattern, $pointer, $matches);
+//        $this->assertSame('supda saf', $matches);
+//        return;
+
         $testFile = Yii::getAlias("@specs/issue_fix/74_invalid_schema_reference_error/index.php");
 
         $this->runGenerator($testFile);