Change logic

Author: SOHELAHMED7

src/lib/AttributeResolver.php

@@ -278,9 +278,7 @@ protected function resolveProperty(
             if ($property->isRefPointerToSelf()) {
                 $relation->asSelfReference();
             }
-//            if (empty($property->getAttr(CustomSpecAttr::NO_RELATION))) {
             $this->relations[$property->getName()] = $relation;
-//            }
             if (!$property->isRefPointerToSelf()) {
                 $this->addInverseRelation($relatedClassName, $attribute, $property, $fkProperty);
             }
@@ -323,25 +321,21 @@ protected function resolveProperty(
                         $fkProperty->getName(),
                         '_id'
                     )) {
-//                    if (empty($property->getAttr(CustomSpecAttr::NO_RELATION))) {
                     $this->relations[$property->getName()] =
                             Yii::createObject(
                                 AttributeRelation::class,
                                 [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                             )
                                 ->asHasMany([$fkProperty->getName() => $fkProperty->getName()])->asSelfReference();
-//                    }
                     return;
                 }
                 $foreignPk = Inflector::camel2id($fkProperty->getName(), '_') . '_id';
-//                if (empty($property->getAttr(CustomSpecAttr::NO_RELATION))) {
                 $this->relations[$property->getName()] =
                         Yii::createObject(
                             AttributeRelation::class,
                             [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                         )
                             ->asHasMany([$foreignPk => $this->componentSchema->getPkName()]);
-//                }
                 return;
             }
             $relatedClassName = $property->getRefClassName();
@@ -355,15 +349,13 @@ protected function resolveProperty(
                 return;
             }
             $attribute->setPhpType($relatedClassName . '[]');
-//            if (empty($property->getAttr(CustomSpecAttr::NO_RELATION))) {
             $this->relations[$property->getName()] =
                     Yii::createObject(
                         AttributeRelation::class,
                         [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                     )
                         ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->componentSchema->getPkName()])
                         ->setInverse(Inflector::variablize($this->schemaName));
-//            }
             return;
         }
         if ($this->componentSchema->isNonDb() && $attribute->isReference()) {

src/lib/openapi/PropertySchema.php

@@ -145,6 +145,7 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             $property = $this->property;
         }
 
+        // don't go reference part if `x-no-relation` is true
         if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {
             return;
         }
@@ -186,10 +187,6 @@ private function initReference():void
         if ($this->refSchema && $this->refSchema->isNonDb()) {
             $this->isNonDbReference = true;
         }
-        if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {
-            $this->isReference = false;
-            $this->isNonDbReference = true;
-        }
     }
 
     /**
@@ -199,9 +196,6 @@ private function initReference():void
     private function initItemsReference():void
     {
         $this->isItemsReference = true;
-        if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {
-            $this->isItemsReference = false;
-        }
         $items = $this->property->items ?? null;
         if (!$items) {
             return;
@@ -217,9 +211,6 @@ private function initItemsReference():void
         if ($this->refSchema && $this->refSchema->isNonDb()) {
             $this->isNonDbReference = true;
         }
-        if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {
-            $this->isNonDbReference = true;
-        }
     }
 
     public function setName(string $name):void
@@ -511,7 +502,7 @@ public function guessDbType($forReference = false):string
                 }
                 return YiiDbSchema::TYPE_TEXT;
             case 'object':
-            case 'array': // TODO WIP Resume from here
+            case 'array':
             {
                 return YiiDbSchema::TYPE_JSON;
             }