Fix this issue

Author: SOHELAHMED7

src/lib/AttributeResolver.php

@@ -7,8 +7,6 @@
 
 namespace cebe\yii2openapi\lib;
 
-use cebe\yii2openapi\lib\Config;
-use cebe\yii2openapi\lib\CustomSpecAttr;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\AttributeRelation;
@@ -22,7 +20,6 @@
 use Yii;
 use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
-use yii\helpers\VarDumper;
 use function explode;
 use function strpos;
 use function strtolower;
@@ -266,7 +263,7 @@ protected function resolveProperty(
 
             $relation = Yii::createObject(
                 AttributeRelation::class,
-                [$property->getName(), $relatedTableName, $relatedClassName]
+                [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
             )
                            ->asHasOne([$fkProperty->getName() => $attribute->columnName]);
             $relation->onUpdateFkConstraint = $property->onUpdateFkConstraint;
@@ -317,7 +314,7 @@ protected function resolveProperty(
                     $this->relations[$property->getName()] =
                         Yii::createObject(
                             AttributeRelation::class,
-                            [$property->getName(), $relatedTableName, $relatedClassName]
+                            [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                         )
                            ->asHasMany([$fkProperty->getName() => $fkProperty->getName()])->asSelfReference();
                     return;
@@ -326,7 +323,7 @@ protected function resolveProperty(
                 $this->relations[$property->getName()] =
                     Yii::createObject(
                         AttributeRelation::class,
-                        [$property->getName(), $relatedTableName, $relatedClassName]
+                        [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                     )
                        ->asHasMany([$foreignPk => $this->schema->getPkName()]);
                 return;
@@ -345,7 +342,7 @@ protected function resolveProperty(
             $this->relations[$property->getName()] =
                 Yii::createObject(
                     AttributeRelation::class,
-                    [$property->getName(), $relatedTableName, $relatedClassName]
+                    [static::relationName($property->getName(), $property->fkColName), $relatedTableName, $relatedClassName]
                 )
                    ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->schema->getPkName()]);
             return;
@@ -492,4 +489,13 @@ protected function resolvePropertyRef(PropertySchema $property, Attribute $attri
         $this->attributes[$property->getName()] =
             $attribute->setFakerStub($this->guessFakerStub($attribute, $fkProperty));
     }
+
+    public static function relationName(string $propertyName, ?string $fkColumnName): string
+    {
+        $relationName = $propertyName;
+        if (!str_contains($fkColumnName, '_')) {
+            $relationName = strtolower($fkColumnName) === strtolower($relationName) ? $relationName . 'Rel' : $relationName;
+        }
+        return $relationName;
+    }
 }

tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.yaml',
+    'generateUrls' => true,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => true,
+    'generateMigrations' => true,
+    'generateModelFaker' => true,
+];

tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.yaml

@@ -0,0 +1,34 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Extension FK COLUMN NAME cause error in case of column name without underscore \#29
+paths:
+  /:
+    get:
+      summary: List
+      operationId: list
+      responses:
+        '200':
+          description: The information
+
+components:
+  schemas:
+    User:
+      type: object
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+    Post:
+      type: object
+      properties:
+        id:
+          type: integer
+        content:
+          type: string
+        user:
+          allOf:
+            - $ref: '#/components/schemas/User'
+            - x-fk-column-name: user
+

tests/unit/IssueFixTest.php

@@ -360,4 +360,18 @@ public function test158BugGiiapiGeneratedRulesEnumWithTrim()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
+
+    // https://github.com/php-openapi/yii2-openapi/issues/29
+    public function test29ExtensionFkColumnNameCauseErrorInCaseOfColumnNameWithoutUnderscore()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.php");
+        $this->runGenerator($testFile);
+        // $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+        //     'recursive' => true,
+        // ]);
+        // $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql"), [
+        //     'recursive' => true,
+        // ]);
+        // $this->checkFiles($actualFiles, $expectedFiles); // TODO
+    }
 }