Fix failing tests

SOHELAHMED7 · SOHELAHMED7 · commit 5b1ec545c62e · 2025-03-04T15:28:05.000+05:30
diff --git a/src/generator/default/dbmodel.php b/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; ?>
 }
diff --git a/tests/specs/blog/models/base/Category.php b/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']);
+    }
 }
diff --git a/tests/specs/blog/models/base/Post.php b/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']);
+    }
 }
diff --git a/tests/specs/blog/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/blog_v2/models/base/Category.php b/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']);
+    }
 }
diff --git a/tests/specs/blog_v2/models/base/Post.php b/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']);
+    }
 }
diff --git a/tests/specs/blog_v2/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/fk_col_name/app/models/base/Delivery.php b/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']);
+    }
 }
diff --git a/tests/specs/fk_col_name/app/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/fk_col_name_index/app/models/base/Delivery.php b/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']);
+    }
 }
diff --git a/tests/specs/fk_col_name_index/app/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/159_bug_giiapi_generated_rules_emailid/maria/models/base/Mailing.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/162_bug_dollarref_with_x_faker/app/models/base/Invoice.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/175_bug_allof_with_multiple_dollarrefs/pgsql/models/base/Account.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/index.yaml b/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'
-
-
diff --git a/tests/specs/issue_fix/88_in_case_of_updating_a_model_generator_creates_redundant_inverse_relations/mysql/models/base/Address.php b/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']);
+    }
 }
diff --git a/tests/specs/issue_fix/model_name_more_than_once_in_faker_148/app/models/base/Account.php b/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']);
+    }
 }
diff --git a/tests/specs/petstore/models/base/Store.php b/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']);
+    }
 }
diff --git a/tests/specs/petstore_jsonapi/models/base/Pet.php b/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']);
+    }
 }
diff --git a/tests/specs/petstore_namespace/mymodels/base/Store.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/A123.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/Account.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/B123.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/C123.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/D123.php b/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']);
+    }
 }
diff --git a/tests/specs/relations_in_faker/app/models/base/Domain.php b/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']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -144,14 +144,14 @@ public function get<?= $relation->getCamelName() ?>()`
`144`	`144`	`<?php endif;?>`
`145`	`145`	`}`
`146`	`146`	`<?php endforeach; ?>`
`147`		`-<?php $i = 1;`
`148`		`-foreach ($model->belongsToRelations as $relationName => $relation): ?>`
	`147`	`+<?php $i = 1; $usedRelationNames = [];`
	`148`	`+foreach ($model->belongsToRelations as $relationName => $relation): ?><?php $number = in_array($relation->getCamelName(), $usedRelationNames) ? $i : '' ?>`
`149`	`149`
`150`	`150`	`# belongs to relation`
`151`		`- public function get<?= $relation->getCamelName() . ($i === 1 ? '' : $i) ?>()`
	`151`	`+ public function get<?= $relation->getCamelName() . ($number) ?>()`
`152`	`152`	`{`
`153`	`153`	`return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php`
`154`	`154`	`echo $relation->linkToString() ?>);`
`155`	`155`	`}`
`156`		`-<?php $i++; endforeach; ?>`
	`156`	`+<?php $i++; $usedRelationNames[] = $relation->getCamelName(); endforeach; ?>`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,10 @@ public function getPosts()`
`38`	`38`	`{`
`39`	`39`	`return $this->hasMany(\app\models\Post::class, ['category_id' => 'id'])->inverseOf('category');`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ # belongs to relation`
	`43`	`+ public function getPost()`
	`44`	`+ {`
	`45`	`+ return $this->hasOne(\app\models\Post::class, ['category_id' => 'id']);`
	`46`	`+ }`
`41`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,4 +61,10 @@ public function getComments()`
`61`	`61`	`{`
`62`	`62`	`return $this->hasMany(\app\models\Comment::class, ['post_id' => 'uid'])->inverseOf('post');`
`63`	`63`	`}`
	`64`	`+`
	`65`	`+ # belongs to relation`
	`66`	`+ public function getComment()`
	`67`	`+ {`
	`68`	`+ return $this->hasOne(\app\models\Comment::class, ['post_id' => 'uid']);`
	`69`	`+ }`
`64`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,4 +73,10 @@ public function getTags()`
`73`	`73`	`return $this->hasMany(\app\models\Tag::class, ['id' => 'tag_id'])`
`74`	`74`	`->viaTable('posts2tags', ['post_id' => 'id']);`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ # belongs to relation`
	`78`	`+ public function getComment()`
	`79`	`+ {`
	`80`	`+ return $this->hasOne(\app\models\Comment::class, ['post_id' => 'id']);`
	`81`	`+ }`
`76`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,10 @@ public function rules()`
`27`	`27`	`'title_string' => [['title'], 'string'],`
`28`	`28`	`];`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ # belongs to relation`
	`32`	`+ public function getWebhook()`
	`33`	`+ {`
	`34`	`+ return $this->hasOne(\app\models\Webhook::class, ['redelivery_of' => 'id']);`
	`35`	`+ }`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,10 @@ public function rules()`
`28`	`28`	`'name_string' => [['name'], 'string'],`
`29`	`29`	`];`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ # belongs to relation`
	`33`	`+ public function getWebhook()`
	`34`	`+ {`
	`35`	`+ return $this->hasOne(\app\models\Webhook::class, ['user_id' => 'id']);`
	`36`	`+ }`
`31`	`37`	`}`