Fix failing tests

Author: SOHELAHMED7

src/generator/default/dbmodel.php

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

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

@@ -38,4 +38,10 @@ 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']);
+    }
 }

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

@@ -61,4 +61,10 @@ 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']);
+    }
 }

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

@@ -44,4 +44,16 @@ public function rules()
             'email_unique' => [['email'], 'unique'],
         ];
     }
+
+    # belongs to relation
+    public function getPost()
+    {
+        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id']);
+    }
+
+    # belongs to relation
+    public function getComment()
+    {
+        return $this->hasOne(\app\models\Comment::class, ['author_id' => 'id']);
+    }
 }

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

@@ -38,4 +38,10 @@ 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']);
+    }
 }

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

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

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

@@ -47,4 +47,16 @@ public function rules()
             'email_unique' => [['email'], 'unique'],
         ];
     }
+
+    # belongs to relation
+    public function getPost()
+    {
+        return $this->hasOne(\app\models\Post::class, ['created_by_id' => 'id']);
+    }
+
+    # belongs to relation
+    public function getComment()
+    {
+        return $this->hasOne(\app\models\Comment::class, ['user_id' => 'id']);
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -29,5 +29,3 @@ components:
           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/base/Address.php

@@ -27,4 +27,10 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    # belongs to relation
+    public function getHuman()
+    {
+        return $this->hasOne(\app\models\Human::class, ['address_id' => 'id']);
+    }
 }

tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php

@@ -28,4 +28,22 @@ public function rules()
             'name_string' => [['name'], 'string', 'max' => 40],
         ];
     }
+
+    # belongs to relation
+    public function getE123()
+    {
+        return $this->hasOne(\app\models\E123::class, ['account_id' => 'id']);
+    }
+
+    # belongs to relation
+    public function getE1232()
+    {
+        return $this->hasOne(\app\models\E123::class, ['account_2_id' => 'id']);
+    }
+
+    # belongs to relation
+    public function getE1233()
+    {
+        return $this->hasOne(\app\models\E123::class, ['account_3_id' => 'id']);
+    }
 }

tests/specs/petstore/models/base/Store.php

@@ -28,4 +28,10 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    # belongs to relation
+    public function getPet()
+    {
+        return $this->hasOne(\app\models\Pet::class, ['store_id' => 'id']);
+    }
 }

tests/specs/petstore_jsonapi/models/base/Pet.php

@@ -63,4 +63,10 @@ public function getDuplicates()
     {
         return $this->hasMany(\app\models\Pet::class, ['tag' => 'tag']);
     }
+
+    # belongs to relation
+    public function getPetStatistic()
+    {
+        return $this->hasOne(\app\models\PetStatistic::class, ['parentPet_id' => 'id']);
+    }
 }

tests/specs/petstore_namespace/mymodels/base/Store.php

@@ -28,4 +28,10 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    # belongs to relation
+    public function getPet()
+    {
+        return $this->hasOne(\app\mymodels\Pet::class, ['store_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/A123.php

@@ -36,4 +36,10 @@ public function getB123()
     {
         return $this->hasOne(\app\models\B123::class, ['id' => 'b123_id']);
     }
+
+    # belongs to relation
+    public function getRouting()
+    {
+        return $this->hasOne(\app\models\Routing::class, ['a123_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/Account.php

@@ -28,4 +28,10 @@ public function rules()
             'name_string' => [['name'], 'string', 'max' => 40],
         ];
     }
+
+    # belongs to relation
+    public function getDomain()
+    {
+        return $this->hasOne(\app\models\Domain::class, ['account_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/B123.php

@@ -36,4 +36,16 @@ public function getC123()
     {
         return $this->hasOne(\app\models\C123::class, ['id' => 'c123_id']);
     }
+
+    # belongs to relation
+    public function getA123()
+    {
+        return $this->hasOne(\app\models\A123::class, ['b123_id' => 'id']);
+    }
+
+    # belongs to relation
+    public function getE123()
+    {
+        return $this->hasOne(\app\models\E123::class, ['b123_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/C123.php

@@ -27,4 +27,10 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    # belongs to relation
+    public function getB123()
+    {
+        return $this->hasOne(\app\models\B123::class, ['c123_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/D123.php

@@ -27,4 +27,10 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    # belongs to relation
+    public function getRouting()
+    {
+        return $this->hasOne(\app\models\Routing::class, ['d123_id' => 'id']);
+    }
 }

tests/specs/relations_in_faker/app/models/base/Domain.php

@@ -44,4 +44,10 @@ public function getRoutings()
     {
         return $this->hasMany(\app\models\Routing::class, ['domain_id' => 'id'])->inverseOf('domain');
     }
+
+    # belongs to relation
+    public function getRouting()
+    {
+        return $this->hasOne(\app\models\Routing::class, ['domain_id' => 'id']);
+    }
 }