Merge branch '88-in-case-of-updating-a-model-generator-creates-redundant-inverse-relations' of github.com:php-openapi/yii2-openapi into fix-conflicting-pull-requests

Author: SOHELAHMED7

src/generator/default/dbmodel.php

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

src/lib/AttributeResolver.php

@@ -60,11 +60,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 +227,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');
@@ -279,10 +275,8 @@ protected function resolveProperty(
                 $relation->asSelfReference();
             }
             $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 +332,7 @@ protected function resolveProperty(
                         ->asHasMany([$foreignPk => $this->componentSchema->getPkName()]);
                 return;
             }
+
             $relatedClassName = $property->getRefClassName();
             $relatedTableName = $property->getRefSchema()->resolveTableName($relatedClassName);
             if ($this->catchManyToMany(
@@ -518,22 +513,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,21 +106,10 @@ 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
-        foreach ($resolvers as $aResolver) {
-            foreach ($aResolver->inverseRelations as $name => $relations) {
-                foreach ($relations as $relation) {
-                    /** @var AttributeRelation $relation */
-                    $models[$name]->inverseRelations[] = $relation;
-                }
-            }
-        }
-
         foreach ($models as $model) {
             foreach ($model->many2many as $relation) {
                 if (isset($models[$relation->viaModelName])) {

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 = [];
 
     /**

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

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

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

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

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

@@ -44,14 +44,4 @@ public function rules()
             'email_unique' => [['email'], 'unique'],
         ];
     }
-
-    public function getPost()
-    {
-        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id'])->inverseOf('created_by');
-    }
-
-    public function getComment2()
-    {
-        return $this->hasOne(\app\models\Comment::class, ['author_id' => 'id'])->inverseOf('author');
-    }
 }

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

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

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

@@ -73,9 +73,4 @@ public function getTags()
         return $this->hasMany(\app\models\Tag::class, ['id' => 'tag_id'])
                     ->viaTable('posts2tags', ['post_id' => 'id']);
     }
-
-    public function getComment()
-    {
-        return $this->hasOne(\app\models\Comment::class, ['post_id' => 'id'])->inverseOf('post');
-    }
 }

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

@@ -47,14 +47,4 @@ public function rules()
             'email_unique' => [['email'], 'unique'],
         ];
     }
-
-    public function getPost()
-    {
-        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id'])->inverseOf('created_by');
-    }
-
-    public function getComment2()
-    {
-        return $this->hasOne(\app\models\Comment::class, ['user_id' => 'id'])->inverseOf('user');
-    }
 }

tests/specs/fk_col_name/app/models/base/Delivery.php

@@ -27,9 +27,4 @@ public function rules()
             'title_string' => [['title'], 'string'],
         ];
     }
-
-    public function getWebhook()
-    {
-        return $this->hasOne(\app\models\Webhook::class, ['redelivery_of' => 'id'])->inverseOf('redelivery_of');
-    }
 }

tests/specs/fk_col_name/app/models/base/User.php

@@ -28,9 +28,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getWebhook()
-    {
-        return $this->hasOne(\app\models\Webhook::class, ['user_id' => 'id'])->inverseOf('user');
-    }
 }

tests/specs/fk_col_name_index/app/models/base/Delivery.php

@@ -27,14 +27,4 @@ public function rules()
             'title_string' => [['title'], 'string'],
         ];
     }
-
-    public function getWebhook()
-    {
-        return $this->hasOne(\app\models\Webhook::class, ['redelivery_of' => 'id'])->inverseOf('redelivery_of');
-    }
-
-    public function getWebhook2()
-    {
-        return $this->hasOne(\app\models\Webhook::class, ['rd_abc_2' => 'id'])->inverseOf('rd2');
-    }
 }

tests/specs/fk_col_name_index/app/models/base/User.php

@@ -28,9 +28,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getWebhook()
-    {
-        return $this->hasOne(\app\models\Webhook::class, ['user_id' => 'id'])->inverseOf('user');
-    }
 }

tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php

@@ -30,9 +30,4 @@ public function rules()
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
         ];
     }
-
-    public function getContact()
-    {
-        return $this->hasOne(\app\models\Contact::class, ['mailing_id' => 'id'])->inverseOf('mailing');
-    }
 }

tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php

@@ -23,9 +23,4 @@ public function rules()
     {
         return [];
     }
-
-    public function getOrder()
-    {
-        return $this->hasOne(\app\models\Order::class, ['invoice_id' => 'id'])->inverseOf('invoice');
-    }
 }

tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php

@@ -30,9 +30,4 @@ public function rules()
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
         ];
     }
-
-    public function getContact()
-    {
-        return $this->hasOne(\app\models\Contact::class, ['account_id' => 'id'])->inverseOf('account');
-    }
 }

tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php

@@ -34,19 +34,4 @@ public function getAccounts()
     {
         return $this->hasMany(\app\models\Account::class, ['user_id' => 'id'])->inverseOf('user');
     }
-
-    public function getAccount()
-    {
-        return $this->hasOne(\app\models\Account::class, ['user_id' => 'id'])->inverseOf('user');
-    }
-
-    public function getAccount2()
-    {
-        return $this->hasOne(\app\models\Account::class, ['user2_id' => 'id'])->inverseOf('user2');
-    }
-
-    public function getAccount3()
-    {
-        return $this->hasOne(\app\models\Account::class, ['user3' => 'id'])->inverseOf('user3');
-    }
 }

tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php

@@ -27,9 +27,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getPost()
-    {
-        return $this->hasOne(\app\models\Post::class, ['user' => 'id'])->inverseOf('user');
-    }
 }

tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php

@@ -27,9 +27,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getInvoice()
-    {
-        return $this->hasOne(\app\models\Invoice::class, ['animal_id' => 'id'])->inverseOf('animal');
-    }
 }

tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php

@@ -27,9 +27,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getInvoice()
-    {
-        return $this->hasOne(\app\models\Invoice::class, ['fruit_id' => 'id'])->inverseOf('fruit');
-    }
 }

tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php

@@ -27,14 +27,4 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
-
-    public function getInvoice()
-    {
-        return $this->hasOne(\app\models\Invoice::class, ['user_id' => 'id'])->inverseOf('user');
-    }
-
-    public function getInvoice2()
-    {
-        return $this->hasOne(\app\models\Invoice::class, ['user_2_id' => 'id'])->inverseOf('user_2');
-    }
 }

tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/index.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/index.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => false,
+    'generateModelFaker' => false, // `generateModels` must be `true` in order to use `generateModelFaker` as `true`
+];

tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/index.yaml

@@ -0,0 +1,33 @@
+openapi: "3.0.0"
+
+info:
+  version: 1.0.0
+  title: '#88'
+
+paths:
+  /:
+    get:
+      responses:
+        '200':
+          description: The response
+
+components:
+  schemas:
+    Address:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+    Human:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+        address:
+          $ref: '#/components/schemas/Address'
+
+

tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/mysql/models/Address.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Address extends \app\models\base\Address
+{
+
+
+}
+

tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/mysql/models/Human.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Human extends \app\models\base\Human
+{
+
+
+}
+