Merge branch 'master' of github.com:php-openapi/yii2-openapi into 78-properties-that-are-marked-as-readonly-are-not-read-only

Author: SOHELAHMED7

src/generator/default/dbmodel.php

@@ -146,12 +146,14 @@ public function get<?= $relation->getCamelName() ?>()
 <?php endif;?>
     }
 <?php endforeach; ?>
-<?php $i = 1; foreach ($model->inverseRelations as $relationName => $relation): ?>
+<?php $i = 1; $usedRelationNames = [];
+foreach ($model->belongsToRelations as $relationName => $relation): ?><?php $number = in_array($relation->getCamelName(), $usedRelationNames) ? $i : '' ?>
 
-    public function get<?= $relation->getCamelName().($i===1 ? '' : $i) ?>()
+    # belongs to relation
+    public function get<?= $relation->getCamelName() . ($number) ?>()
     {
         return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php
-    echo $relation->linkToString() ?>)->inverseOf('<?= $relation->getInverse() ?>');
+    echo $relation->linkToString() ?>);
     }
-<?php $i++; endforeach; ?>
+<?php $i++; $usedRelationNames[] = $relation->getCamelName(); endforeach; ?>
 }

src/lib/AttributeResolver.php

@@ -37,6 +37,11 @@ class AttributeResolver
      */
     public array $relations = [];
 
+    /**
+     * @var array keys contains class names and value contains array of belongs to relations
+     */
+    public array $belongsToRelations = [];
+
     /**
      * @var NonDbRelation[]|array
      */
@@ -60,11 +65,6 @@ class AttributeResolver
 
     private ?Config $config;
 
-    /**
-     * @var AttributeRelation[]|array
-     */
-    public array $inverseRelations = [];
-
     public function __construct(string $schemaName, ComponentSchema $schema, JunctionSchemas $junctions, ?Config $config = null)
     {
         $this->schemaName = $schemaName;
@@ -232,6 +232,7 @@ protected function resolveProperty(
                   ->setForeignKeyColumnName($property->fkColName)
                   ->setFakerStub($this->guessFakerStub($attribute, $property))
                   ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
+
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');
@@ -277,12 +278,17 @@ protected function resolveProperty(
             $relation->onDeleteFkConstraint = $property->onDeleteFkConstraint;
             if ($property->isRefPointerToSelf()) {
                 $relation->asSelfReference();
+            } else { # belongs to relations https://github.com/php-openapi/yii2-openapi/issues/90
+                $belongsToRelation = Yii::createObject(
+                    AttributeRelation::class,
+                    [$this->schemaName, $this->tableName, $this->schemaName]
+                )
+                    ->asHasOne([$attribute->columnName => $fkProperty->getName()]);
+                $this->belongsToRelations[$property->getRefClassName()][] = $belongsToRelation;
             }
             $this->relations[$property->getName()] = $relation;
-            if (!$property->isRefPointerToSelf()) {
-                $this->addInverseRelation($relatedClassName, $attribute, $property, $fkProperty);
-            }
         }
+
         if (!$property->isReference() && !$property->hasRefItems()) {
             [$min, $max] = $property->guessMinMax();
             $attribute->setIsVirtual($property->isVirtual())
@@ -338,6 +344,7 @@ protected function resolveProperty(
                         ->asHasMany([$foreignPk => $this->componentSchema->getPkName()]);
                 return;
             }
+
             $relatedClassName = $property->getRefClassName();
             $relatedTableName = $property->getRefSchema()->resolveTableName($relatedClassName);
             if ($this->catchManyToMany(
@@ -518,22 +525,4 @@ public static function relationName(string $propertyName, ?string $fkColumnName)
         }
         return $relationName;
     }
-
-    /**
-     * @throws InvalidConfigException
-     */
-    public function addInverseRelation(
-        string $relatedClassName,
-        Attribute $attribute,
-        PropertySchema $property,
-        PropertySchema $fkProperty
-    ): void {
-        $inverseRelation = Yii::createObject(
-            AttributeRelation::class,
-            [$this->schemaName, $this->tableName, $this->schemaName]
-        )
-            ->asHasOne([$attribute->columnName => $fkProperty->getName()]);
-        $inverseRelation->setInverse($property->getName());
-        $this->inverseRelations[$relatedClassName][] = $inverseRelation;
-    }
 }

src/lib/SchemaToDatabase.php

@@ -106,18 +106,15 @@ public function prepareModels(): array
             /** @var AttributeResolver $resolver */
             $resolver = Yii::createObject(AttributeResolver::class, [$schemaName, $schema, $junctions, $this->config]);
 
-            // $models[$schemaName] = $resolver->resolve();
             $resolvers[$schemaName] = $resolver;
             $models[$schemaName] = $resolvers[$schemaName]->resolve();
         }
 
-        // handle inverse relation
+        // handle belongs to relation
         foreach ($resolvers as $aResolver) {
-            foreach ($aResolver->inverseRelations as $name => $relations) {
-                foreach ($relations as $relation) {
-                    /** @var AttributeRelation $relation */
-                    $models[$name]->inverseRelations[] = $relation;
-                }
+            foreach ($aResolver->belongsToRelations as $name => $relations) {
+                /** @var AttributeRelation[] $relations */
+                $models[$name]->belongsToRelations = [...$models[$name]->belongsToRelations, ...$relations];
             }
         }
 

src/lib/items/DbModel.php

@@ -67,11 +67,6 @@ class DbModel extends BaseObject
      */
     public array $many2many = [];
 
-    /**
-     * @var array|AttributeRelation[] inverse relations
-     */
-    public array $inverseRelations = [];
-
     public array $junctionCols = [];
 
     /**
@@ -91,9 +86,9 @@ class DbModel extends BaseObject
     public bool $descriptionIsComment = false;
 
     /**
-     * @var array Automatically generated scenarios from the model 'x-scenarios'.
+     * @var AttributeRelation[] belongs to relations
      */
-    private $_scenarios;
+    public array $belongsToRelations = [];
 
     /**
      * @var bool
@@ -103,6 +98,11 @@ class DbModel extends BaseObject
      */
     public $drop = false;
 
+    /**
+     * @var array Automatically generated scenarios from the model 'x-scenarios'.
+     */
+    private $_scenarios;
+
     public function getTableAlias(): string
     {
         return '{{%' . $this->tableName . '}}';

tests/specs/blog/models/base/Category.php

@@ -39,8 +39,9 @@ public function getPosts()
         return $this->hasMany(\app\models\Post::class, ['category_id' => 'id'])->inverseOf('category');
     }
 
+    # belongs to relation
     public function getPost()
     {
-        return $this->hasOne(\app\models\Post::class, ['category_id' => 'id'])->inverseOf('category');
+        return $this->hasOne(\app\models\Post::class, ['category_id' => 'id']);
     }
 }

tests/specs/blog/models/base/Post.php

@@ -62,8 +62,9 @@ public function getComments()
         return $this->hasMany(\app\models\Comment::class, ['post_id' => 'uid'])->inverseOf('post');
     }
 
+    # belongs to relation
     public function getComment()
     {
-        return $this->hasOne(\app\models\Comment::class, ['post_id' => 'uid'])->inverseOf('post');
+        return $this->hasOne(\app\models\Comment::class, ['post_id' => 'uid']);
     }
 }

tests/specs/blog/models/base/User.php

@@ -45,13 +45,15 @@ public function rules()
         ];
     }
 
+    # belongs to relation
     public function getPost()
     {
-        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id'])->inverseOf('created_by');
+        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id']);
     }
 
-    public function getComment2()
+    # belongs to relation
+    public function getComment()
     {
-        return $this->hasOne(\app\models\Comment::class, ['author_id' => 'id'])->inverseOf('author');
+        return $this->hasOne(\app\models\Comment::class, ['author_id' => 'id']);
     }
 }

tests/specs/blog_v2/models/base/Category.php

@@ -39,8 +39,9 @@ public function getPosts()
         return $this->hasMany(\app\models\Post::class, ['category_id' => 'id'])->inverseOf('category');
     }
 
+    # belongs to relation
     public function getPost()
     {
-        return $this->hasOne(\app\models\Post::class, ['category_id' => 'id'])->inverseOf('category');
+        return $this->hasOne(\app\models\Post::class, ['category_id' => 'id']);
     }
 }

tests/specs/blog_v2/models/base/Post.php

@@ -74,8 +74,9 @@ public function getTags()
                     ->viaTable('posts2tags', ['post_id' => 'id']);
     }
 
+    # belongs to relation
     public function getComment()
     {
-        return $this->hasOne(\app\models\Comment::class, ['post_id' => 'id'])->inverseOf('post');
+        return $this->hasOne(\app\models\Comment::class, ['post_id' => 'id']);
     }
 }

tests/specs/blog_v2/models/base/User.php

@@ -48,13 +48,15 @@ public function rules()
         ];
     }
 
+    # belongs to relation
     public function getPost()
     {
-        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id'])->inverseOf('created_by');
+        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id']);
     }
 
-    public function getComment2()
+    # belongs to relation
+    public function getComment()
     {
-        return $this->hasOne(\app\models\Comment::class, ['user_id' => 'id'])->inverseOf('user');
+        return $this->hasOne(\app\models\Comment::class, ['user_id' => 'id']);
     }
 }