Skip to content

Commit

Permalink
ESDEV-3841 Style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@hkreuter @robertblank
hkreuter authored and robertblank committed Oct 17, 2016
1 parent fb807c1 commit 5f4a9c7
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
40 changes: 20 additions & 20 deletions source/Core/Database/Adapter/DatabaseInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License
* along with OXID eShop Community Edition. If not, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxid-esales.com
* @copyright (C) OXID eSales AG 2003-2016
* @version OXID eShop CE
* @link http://www.oxid-esales.com
* @copyright (C)OXID eSales AG 2003-2016
* @version OXID eShop CE
*/

namespace OxidEsales\Eshop\Core\Database\Adapter;

use OxidEsales\Eshop\Core\Database\Adapter\ResultSetInterface;
use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
use OxidEsales\Eshop\Core\Exception\DatabaseException;

Expand Down Expand Up @@ -120,18 +119,18 @@ public function setFetchMode($fetchMode);
* NOTE: Although you might pass any SELECT or SHOW statement to this method, try to limit the result of the
* statement to one single row, as the rest of the rows is simply discarded.
*
* @param string $query The sql SELECT or SHOW statement.
* @param array $parameters Array of parameters for the given sql statement.
* @param string $query The sql SELECT or SHOW statement.
* @param array $parameters Array of parameters for the given sql statement.
*
* @return string|false Returns a string for SELECT or SHOW statements and FALSE for any other statement.
* @return string|false Returns a string for SELECT or SHOW statements and FALSE for any other statement.
*/
public function getOne($query, $parameters = array());

/**
* Get an array with the values of the first row of a given sql SELECT or SHOW statement .
* Returns an empty array for any other statement.
* The returned value depends on the fetch mode.
* @see DatabaseInterface::setFetchMode() for how to set the fetch mode
* @see DatabaseInterface::setFetchMode() for how to set the fetch mode
*
* The keys of the array may be numeric, strings or both, depending on the FETCH_MODE_* of the connection.
* Set the desired fetch mode with DatabaseInterface::setFetchMode() before calling this method.
Expand All @@ -148,9 +147,8 @@ public function getOne($query, $parameters = array());
* If you will not use prepared statements, you MUST quote variables the values with quote(), otherwise you create a
* SQL injection vulnerability.
*
*
* @param string $sqlSelect The sql select statement we want to execute.
* @param array $parameters Array of parameters, for the given sql statement.
* @param string $sqlSelect The sql select statement we want to execute.
* @param array $parameters Array of parameters, for the given sql statement.
*
* @return array The row, we selected with the given sql statement.
*/
Expand All @@ -169,8 +167,8 @@ public function getRow($sqlSelect, $parameters = array());
* If you will not use prepared statements, you MUST quote variables the values with quote(), otherwise you create a
* SQL injection vulnerability.
*
* @param string $sqlSelect The sql select statement
* @param array $parameters The parameters array.
* @param string $sqlSelect The sql select statement
* @param array $parameters The parameters array.
*
* @throws DatabaseException
*
Expand All @@ -195,14 +193,14 @@ public function getCol($sqlSelect, $parameters = array());
* If you will not use prepared statements, you MUST quote variables the values with quote(), otherwise you create a
* SQL injection vulnerability.
*
* @param string $query If parameters are given, the "?" in the string will be replaced by the values in the array
* @param array $parameters Array of parameters, for the given sql statement.
* @param string $query If parameters are given, the "?" in the string will be replaced by the values in the array
* @param array $parameters Array of parameters, for the given sql statement.
*
* @see DatabaseInterface::setFetchMode()
* @see Doctrine::$fetchMode
*
* @throws DatabaseException
* @throws \InvalidArgumentException
* @throws DatabaseException
* @throws \InvalidArgumentException
*
* @return array
*/
Expand All @@ -225,12 +223,12 @@ public function getAll($query, $parameters = array());
* If you will not use prepared statements, you MUST quote variables the values with quote(), otherwise you create a
* SQL injection vulnerability.
*
* @param string $sqlSelect The sql select statement
* @param array $parameters The parameters array for the given query.
* @param string $sqlSelect The sql select statement
* @param array $parameters The parameters array for the given query.
*
* @throws DatabaseException The exception, that can occur while executing the sql statement.
*
* @return ResultSetInterface The result of the given query.
* @return \OxidEsales\Eshop\Core\Database\Adapter\ResultSetInterface The result of the given query.
*/
public function select($sqlSelect, $parameters = array());

Expand Down Expand Up @@ -386,6 +384,8 @@ public function rollbackTransaction();
* @param string $level The transaction isolation level
*
* @throws \InvalidArgumentException|DatabaseException
*
* @return
*/
public function setTransactionIsolationLevel($level);

Expand Down
6 changes: 3 additions & 3 deletions source/Core/Database/Adapter/Doctrine/Database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with OXID eShop Community Edition. If not, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxid-esales.com
* @link http://www.oxid-esales.com
* @copyright (C) OXID eSales AG 2003-2016
* @version OXID eShop CE
* @version OXID eShop CE
*/

namespace OxidEsales\Eshop\Core\Database\Adapter\Doctrine;
Expand Down Expand Up @@ -492,7 +492,7 @@ public function select($sqlSelect, $parameters = array())
* The Doctrine Query Builder should be used here.
*
*/
public function selectLimit($sqlSelect, $rowCount = -1, $offset = -1, $parameters = false)
public function selectLimit($sqlSelect, $rowCount = -1, $offset = -1, $parameters = array())
{
/**
* Parameter validation.
Expand Down
4 changes: 2 additions & 2 deletions source/Core/Database/Adapter/Doctrine/ResultSet.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License
* along with OXID eShop Community Edition. If not, see <http://www.gnu.org/licenses/>.
*
* @link http://www.oxid-esales.com
* @link http://www.oxid-esales.com
* @copyright (C) OXID eSales AG 2003-2016
* @version OXID eShop CE
* @version OXID eShop CE
*/

namespace OxidEsales\Eshop\Core\Database\Adapter\Doctrine;
Expand Down

0 comments on commit 5f4a9c7

Please sign in to comment.