remove HasOneSql::withTitle

atk4 · Nov 9, 2021 · 70e8c52 · 70e8c52
1 parent 6943787
commit 70e8c52
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 29 deletions.
diff --git a/docs/model.rst b/docs/model.rst
@@ -702,7 +702,7 @@ Title Field
     you can specify that in the property. If title_field is not needed, set it
     to false or point towards a non-existent field.
 
-    See: :php:meth::`hasOne::addTitle()` and :php:meth::`hasOne::withTitle()`
+    See: :php:meth::`hasOne::addTitle()`
 
 .. php:method:: public getTitle
 

diff --git a/docs/sql.rst b/docs/sql.rst
@@ -131,10 +131,6 @@ SQL Reference
 
     Returns new field object.
 
-.. php:method:: withTitle
-
-    Similar to addTitle, but returns $this.
-
 Expressions
 -----------
 

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -60,8 +60,6 @@ parameters:
         - '~^Call to an undefined method Atk4\\Data\\Reference\\HasOne::addTitle\(\)\.$~'
         # for tests/JoinSqlTest.php
         - '~^Call to an undefined method Atk4\\Data\\Reference\\HasOne::addField\(\)\.$~'
-        # for tests/LookupSqlTest.php
-        - '~^Call to an undefined method Atk4\\Data\\Reference\\HasOne::withTitle\(\)\.$~'
         # for tests/ReferenceSqlTest.php
         - '~^Call to an undefined method Atk4\\Data\\Reference\\HasOne::addFields\(\)\.$~'
         - '~^Call to an undefined method Atk4\\Data\\Reference::addTitle\(\)\.$~'

diff --git a/src/Reference/HasOneSql.php b/src/Reference/HasOneSql.php
@@ -219,20 +219,4 @@ function (Model $ourModel) {
 
         return $fieldExpression;
     }
-
-    /**
-     * Add a title of related entity as expression to our field.
-     *
-     * $order->hasOne('user_id', 'User')->addTitle();
-     *
-     * This will add expression 'user' equal to ref('user_id')['name'];
-     *
-     * @return $this
-     */
-    public function withTitle(array $defaults = [])
-    {
-        $this->addTitle($defaults);
-
-        return $this;
-    }
 }
diff --git a/tests/LookupSqlTest.php b/tests/LookupSqlTest.php
@@ -67,9 +67,9 @@ protected function init(): void
         $this->addField('name');
         $this->addField('is_vip', ['type' => 'boolean', 'default' => false]);
 
-        $this->hasOne('country_id', ['model' => [LCountry::class]])
-            ->withTitle()
-            ->addFields(['country_code' => 'code', 'is_eu']);
+        $ref = $this->hasOne('country_id', ['model' => [LCountry::class]])
+            ->addFields(['country_code' => 'code', 'is_eu'])
+            ->addTitle();
 
         $this->hasMany('Friends', ['model' => [LFriend::class]])
             ->addField('friend_names', ['field' => 'friend_name', 'concat' => ',']);

diff --git a/tests/RandomTest.php b/tests/RandomTest.php
@@ -60,7 +60,7 @@ protected function init(): void
         $this->addField('age');
         $i2 = $this->join('item2.item_id');
         $i2->hasOne('parent_item_id', ['model' => $m, 'table_alias' => 'parent'])
-            ->withTitle();
+            ->addTitle();
 
         $this->hasMany('Child', ['model' => $m, 'their_field' => 'parent_item_id', 'table_alias' => 'child'])
             ->addField('child_age', ['aggregate' => 'sum', 'field' => 'age']);

diff --git a/tests/ScopeTest.php b/tests/ScopeTest.php
@@ -45,8 +45,8 @@ protected function init(): void
         $this->addField('is_vip', ['type' => 'boolean', 'default' => false]);
 
         $this->hasOne('country_id', ['model' => [SCountry::class]])
-            ->withTitle()
-            ->addFields(['country_code' => 'code', 'is_eu']);
+            ->addFields(['country_code' => 'code', 'is_eu'])
+            ->addTitle();
 
         $this->hasMany('Tickets', ['model' => [STicket::class], 'their_field' => 'user']);
     }