Refactor again for more code readability

Author: SOHELAHMED7

src/lib/items/AttributeRelation.php

@@ -7,10 +7,10 @@
 
 namespace cebe\yii2openapi\lib\items;
 
+use cebe\yii2openapi\lib\traits\ForeignKeyConstraints;
 use yii\helpers\Inflector;
 use yii\helpers\VarDumper;
 use function reset;
-use cebe\yii2openapi\lib\traits\ForeignKeyConstraints;
 
 class AttributeRelation
 {
@@ -19,41 +19,29 @@ class AttributeRelation
     public const HAS_ONE = 'hasOne';
     public const HAS_MANY = 'hasMany';
 
-    /**
-     * @var string $name
-     **/
-    private $name;
+    private string $name;
 
-    /**
-     * @var string $tableName
-     **/
-    private $tableName;
+    private ?string $tableName;
 
-    /**
-     * @var string $className
-     **/
-    private $className;
+    private ?string $className;
 
     /**
-     * @var string $method (hasOne/hasMany)
+     * hasOne/hasMany
      **/
-    private $method;
+    private ?string $method;
 
-    /**
-     * @var array
-     **/
-    private $link = [];
+    private array $link;
 
-    /**@var  bool */
-    private $selfReference = false;
+    private bool $selfReference = false;
 
     public function __construct(
-        string $name,
+        string  $name,
         ?string $tableName = null,
         ?string $className = null,
         ?string $method = null,
-        array $link = []
-    ) {
+        array   $link = []
+    )
+    {
         $this->name = $name;
         $this->tableName = $tableName;
         $this->className = $className;
@@ -65,7 +53,7 @@ public function __construct(
      * @param string $name
      * @return AttributeRelation
      */
-    public function setName(string $name):AttributeRelation
+    public function setName(string $name): AttributeRelation
     {
         $this->name = $name;
         return $this;
@@ -75,7 +63,7 @@ public function setName(string $name):AttributeRelation
      * @param string $tableName
      * @return AttributeRelation
      */
-    public function setTableName(string $tableName):AttributeRelation
+    public function setTableName(string $tableName): AttributeRelation
     {
         $this->tableName = $tableName;
         return $this;
@@ -85,108 +73,108 @@ public function setTableName(string $tableName):AttributeRelation
      * @param string $className
      * @return AttributeRelation
      */
-    public function setClassName(string $className):AttributeRelation
+    public function setClassName(string $className): AttributeRelation
     {
         $this->className = $className;
         return $this;
     }
 
-    public function asSelfReference():AttributeRelation
+    public function asSelfReference(): AttributeRelation
     {
         $this->selfReference = true;
         return $this;
     }
 
-    public function asHasOne(array $link):AttributeRelation
+    public function asHasOne(array $link): AttributeRelation
     {
         $this->method = self::HAS_ONE;
         $this->link = $link;
         return $this;
     }
 
-    public function asHasMany(array $link):AttributeRelation
+    public function asHasMany(array $link): AttributeRelation
     {
         $this->method = self::HAS_MANY;
         $this->link = $link;
         return $this;
     }
 
-    public function isHasOne():bool
+    public function isHasOne(): bool
     {
         return $this->method === self::HAS_ONE;
     }
 
-    public function isSelfReferenced():bool
+    public function isSelfReferenced(): bool
     {
         return $this->selfReference;
     }
 
     /**
      * @return string
      */
-    public function getName():string
+    public function getName(): string
     {
         return $this->name;
     }
 
     /**
      * @return string
      */
-    public function getTableName():string
+    public function getTableName(): string
     {
         return $this->tableName;
     }
 
-    public function getTableAlias():string
+    public function getTableAlias(): string
     {
         return "{{%$this->tableName}}";
     }
 
     /**
      * @return string
      */
-    public function getClassName():string
+    public function getClassName(): string
     {
         return $this->className;
     }
 
-    public function getClassKey():string
+    public function getClassKey(): string
     {
         return Inflector::camel2id($this->getClassName());
     }
 
     /**
      * @return string
      */
-    public function getMethod():string
+    public function getMethod(): string
     {
         return $this->method;
     }
 
     /**
      * @return array
      */
-    public function getLink():array
+    public function getLink(): array
     {
         return $this->link;
     }
 
-    public function getCamelName():string
+    public function getCamelName(): string
     {
         return Inflector::camelize($this->name);
     }
 
-    public function getColumnName():string
+    public function getColumnName(): string
     {
         return reset($this->link);
     }
 
-    public function getForeignName():string
+    public function getForeignName(): string
     {
         return key($this->link);
     }
 
-    public function linkToString():string
+    public function linkToString(): string
     {
         return str_replace(
             [',', '=>', ', ]'],

src/lib/items/DbModel.php

@@ -59,6 +59,11 @@ class DbModel extends BaseObject
      */
     public array $many2many = [];
 
+    /**
+     * @var array|AttributeRelation[] inverse relations # TODO
+     */
+    public array $inverseRelations = [];
+
     public array $junctionCols = [];
 
     /**

src/lib/traits/ForeignKeyConstraints.php

@@ -10,18 +10,16 @@
 trait ForeignKeyConstraints
 {
     /**
-     * @var string
      * Contains foreign key constraint
      * @example 'SET NULL'
      * @example 'CASCADE'
      */
-    public $onDeleteFkConstraint;
+    public string $onDeleteFkConstraint;
 
     /**
-     * @var string
      * Contains foreign key constraint
      * @example 'SET NULL'
      * @example 'CASCADE'
      */
-    public $onUpdateFkConstraint;
+    public string $onUpdateFkConstraint;
 }