Skip to content
Permalink
Browse files

Rename as per review.

  • Loading branch information...
dereuromark committed Nov 7, 2016
1 parent 2417f01 commit e88d442e7c1036f79082694ded8cf9905fe8d5f4
Showing with 15 additions and 16 deletions.
  1. +6 −6 src/Database/Connection.php
  2. +3 −3 src/Database/Driver.php
  3. +3 −4 src/Database/Query.php
  4. +3 −3 src/ORM/EagerLoader.php
@@ -447,7 +447,7 @@ public function begin()
}
$this->_transactionLevel++;
if ($this->isEnabledSavePoints()) {
if ($this->isSavePointsEnabled()) {
$this->createSavePoint($this->_transactionLevel);
}
}
@@ -471,7 +471,7 @@ public function commit()
return $this->_driver->commitTransaction();
}
if ($this->isEnabledSavePoints()) {
if ($this->isSavePointsEnabled()) {
$this->releaseSavePoint($this->_transactionLevel);
}
@@ -491,7 +491,7 @@ public function rollback()
return false;
}
$useSavePoint = $this->isEnabledSavePoints();
$useSavePoint = $this->isSavePointsEnabled();
if ($this->_transactionLevel === 0 || !$useSavePoint) {
$this->_transactionLevel = 0;
$this->_transactionStarted = false;
@@ -540,7 +540,7 @@ public function enableSavePoints($enable)
*
* @return bool true if enabled, false otherwise
*/
public function isEnabledSavePoints()
public function isSavePointsEnabled()
{
return $this->_useSavePoints;
}
@@ -559,7 +559,7 @@ public function isEnabledSavePoints()
* `$connection->useSavePoints(false)` Disables usage of savepoints and returns false
* `$connection->useSavePoints()` Returns current status
*
* @deprecated 3.4.0 Use enableSavePoints()/isEnabledSavePoints() instead.
* @deprecated 3.4.0 Use enableSavePoints()/isSavePointsEnabled() instead.
* @param bool|null $enable Whether or not save points should be used.
* @return bool true if enabled, false otherwise
*/
@@ -569,7 +569,7 @@ public function useSavePoints($enable = null)
$this->enableSavePoints($enable);
}
return $this->isEnabledSavePoints();
return $this->isSavePointsEnabled();
}
/**
@@ -316,7 +316,7 @@ public function enableAutoQuoting($enable)
*
* @return bool
*/
public function isEnabledAutoQuoting()
public function isAutoQuotingEnabled()
{
return $this->_autoQuoting;
}
@@ -328,7 +328,7 @@ public function isEnabledAutoQuoting()
* If called with a boolean argument, it will toggle the auto quoting setting
* to the passed value
*
* @deprecated 3.4.0 use enableAutoQuoting()/isEnabledAutoQuoting() instead.
* @deprecated 3.4.0 use enableAutoQuoting()/isAutoQuotingEnabled() instead.
* @param bool|null $enable Whether to enable auto quoting
* @return bool
*/
@@ -338,7 +338,7 @@ public function autoQuoting($enable = null)
$this->enableAutoQuoting($enable);
}
return $this->isEnabledAutoQuoting();
return $this->isAutoQuotingEnabled();
}
/**
@@ -1829,12 +1829,11 @@ public function enableBufferedResults($enable)
*
* @return bool
*/
public function isEnabledBufferedResults()
public function isBufferedResultsEnabled()
{
return $this->_useBufferedResults;
}
/**
* Enable/Disable buffered results.
*
@@ -1848,7 +1847,7 @@ public function isEnabledBufferedResults()
* If called with no arguments, it will return whether or not buffering is
* enabled.
*
* @deprecated 3.4.0 Use enableBufferedResults()/isEnabledBufferedResults() instead.
* @deprecated 3.4.0 Use enableBufferedResults()/isBufferedResultsEnabled() instead.
* @param bool|null $enable Whether or not to enable buffering
* @return bool|$this
*/
@@ -1858,7 +1857,7 @@ public function bufferResults($enable = null)
return $this->enableBufferedResults($enable);
}
return $this->isEnabledBufferedResults();
return $this->isBufferedResultsEnabled();
}
/**
@@ -177,15 +177,15 @@ public function enableAutoFields($enable)
*
* @return bool The current value.
*/
public function isEnabledAutoFields()
public function isAutoFieldsEnabled()
{
return $this->_autoFields;
}
/**
* Sets/Gets whether or not contained associations will load fields automatically.
*
* @deprecated 3.4.0 Use enableAutoFields()/isEnabledAutoFields() instead.
* @deprecated 3.4.0 Use enableAutoFields()/isAutoFieldsEnabled() instead.
* @param bool|null $enable The value to set.
* @return bool The current value.
*/
@@ -195,7 +195,7 @@ public function autoFields($enable = null)
$this->enableAutoFields($enable);
}
return $this->isEnabledAutoFields();
return $this->isAutoFieldsEnabled();
}
/**

0 comments on commit e88d442

Please sign in to comment.
You can’t perform that action at this time.