From e7510d8196e339578ec09b4dd64eda9147352855 Mon Sep 17 00:00:00 2001 From: mscherer Date: Mon, 14 Nov 2016 12:32:50 +0100 Subject: [PATCH] Adjustments as per review. --- src/Database/Schema/TableSchema.php | 16 ++++++++-------- src/ORM/EagerLoadable.php | 13 ++----------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/Database/Schema/TableSchema.php b/src/Database/Schema/TableSchema.php index 230328d5a09..ae0a48d75b1 100644 --- a/src/Database/Schema/TableSchema.php +++ b/src/Database/Schema/TableSchema.php @@ -759,10 +759,10 @@ public function options($options = null) } /** - * Get/Set whether the table is temporary in the database + * Sets whether the table is temporary in the database. * - * @param bool $temporary Whether or not the table is to be temporary - * @return $this TableSchema instance. + * @param bool $temporary Whether or not the table is to be temporary. + * @return $this Instance. */ public function setTemporary($temporary) { @@ -772,11 +772,11 @@ public function setTemporary($temporary) } /** - * Get/Set whether the table is temporary in the database + * Gets whether the table is temporary in the database. * - * @return bool The current temporary setting + * @return bool The current temporary setting. */ - public function getTemporary() + public function isTemporary() { return $this->_temporary; } @@ -784,7 +784,7 @@ public function getTemporary() /** * Get/Set whether the table is temporary in the database * - * @deprecated 3.4.0 Use setTemporary()/getTemporary() instead. + * @deprecated 3.4.0 Use setTemporary()/isTemporary() instead. * @param bool|null $temporary whether or not the table is to be temporary * @return $this|bool Either the TableSchema instance, the current temporary setting */ @@ -794,7 +794,7 @@ public function temporary($temporary = null) return $this->setTemporary($temporary); } - return $this->getTemporary(); + return $this->isTemporary(); } /** diff --git a/src/ORM/EagerLoadable.php b/src/ORM/EagerLoadable.php index b084f04526a..ba0aa03d558 100644 --- a/src/ORM/EagerLoadable.php +++ b/src/ORM/EagerLoadable.php @@ -216,22 +216,13 @@ public function setCanBeJoined($possible) return $this; } - /** - * Gets whether or not this level can be fetched using a join. - * - * @return bool - */ - public function getCanBeJoined() - { - return $this->_canBeJoined; - } - /** * Sets whether or not this level can be fetched using a join. * * If called with no arguments it returns the current value. * - * @deprecated 3.4.0 Use setCanBeJoined()/getCanBeJoined() instead. + * As of 3.4.0 the setter part is deprecated, use setCanBeJoined() instead. + * * @param bool|null $possible The value to set. * @return bool */