From 53cba04c23de1a35c4659f71a96bc262e579f1cf Mon Sep 17 00:00:00 2001 From: William DURAND Date: Mon, 5 Nov 2012 14:00:31 +0100 Subject: [PATCH] Fix CS --- .../ParamConverter/PropelParamConverter.php | 1 + Tests/Fixtures/Model/om/BaseBook.php | 1 - Tests/Fixtures/Model/om/BaseBookPeer.php | 38 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Request/ParamConverter/PropelParamConverter.php b/Request/ParamConverter/PropelParamConverter.php index 33839a24..74bfe663 100644 --- a/Request/ParamConverter/PropelParamConverter.php +++ b/Request/ParamConverter/PropelParamConverter.php @@ -191,6 +191,7 @@ protected function findOneBy($classQuery, Request $request) return $query->findOne(); } else { $results = $query->find(); + return reset($results); } } diff --git a/Tests/Fixtures/Model/om/BaseBook.php b/Tests/Fixtures/Model/om/BaseBook.php index 983e58f7..2ddae717 100644 --- a/Tests/Fixtures/Model/om/BaseBook.php +++ b/Tests/Fixtures/Model/om/BaseBook.php @@ -627,7 +627,6 @@ public function buildCriteria() if ($this->isColumnModified(BookPeer::ID)) $criteria->add(BookPeer::ID, $this->id); if ($this->isColumnModified(BookPeer::NAME)) $criteria->add(BookPeer::NAME, $this->name); if ($this->isColumnModified(BookPeer::SLUG)) $criteria->add(BookPeer::SLUG, $this->slug); - return $criteria; } diff --git a/Tests/Fixtures/Model/om/BaseBookPeer.php b/Tests/Fixtures/Model/om/BaseBookPeer.php index 1d8ee931..e5e2fb69 100644 --- a/Tests/Fixtures/Model/om/BaseBookPeer.php +++ b/Tests/Fixtures/Model/om/BaseBookPeer.php @@ -223,8 +223,8 @@ public static function doCount(Criteria $criteria, $distinct = false, PropelPDO /** * Selects one object from the DB. * - * @param Criteria $criteria object used to create the SELECT statement. - * @param PropelPDO $con + * @param Criteria $criteria object used to create the SELECT statement. + * @param PropelPDO $con * @return Book * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. @@ -243,9 +243,9 @@ public static function doSelectOne(Criteria $criteria, PropelPDO $con = null) /** * Selects several row from the DB. * - * @param Criteria $criteria The Criteria object used to build the SELECT statement. - * @param PropelPDO $con - * @return array Array of selected Objects + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con + * @return array Array of selected Objects * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. */ @@ -259,8 +259,8 @@ public static function doSelect(Criteria $criteria, PropelPDO $con = null) * Use this method directly if you want to work with an executed statement durirectly (for example * to perform your own object hydration). * - * @param Criteria $criteria The Criteria object used to build the SELECT statement. - * @param PropelPDO $con The connection to use + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con The connection to use * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. * @return PDOStatement The executed PDOStatement object. @@ -440,8 +440,8 @@ public static function populateObjects(PDOStatement $stmt) /** * Populates an object of the default type or an object that inherit from the default. * - * @param array $row PropelPDO resultset row. - * @param int $startcol The 0-based offset for reading from the resultset row. + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. * @return array (Book object, last column rank) @@ -506,9 +506,9 @@ public static function getOMClass($withPrefix = true) /** * Performs an INSERT on the database, given a Book or Criteria object. * - * @param mixed $values Criteria or Book object containing data that is used to create the INSERT statement. - * @param PropelPDO $con the PropelPDO connection to use - * @return mixed The new primary key. + * @param mixed $values Criteria or Book object containing data that is used to create the INSERT statement. + * @param PropelPDO $con the PropelPDO connection to use + * @return mixed The new primary key. * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. */ @@ -548,9 +548,9 @@ public static function doInsert($values, PropelPDO $con = null) /** * Performs an UPDATE on the database, given a Book or Criteria object. * - * @param mixed $values Criteria or Book object containing data that is used to create the UPDATE statement. - * @param PropelPDO $con The connection to use (specify PropelPDO connection object to exert more control over transactions). - * @return int The number of affected rows (if supported by underlying database driver). + * @param mixed $values Criteria or Book object containing data that is used to create the UPDATE statement. + * @param PropelPDO $con The connection to use (specify PropelPDO connection object to exert more control over transactions). + * @return int The number of affected rows (if supported by underlying database driver). * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. */ @@ -588,7 +588,7 @@ public static function doUpdate($values, PropelPDO $con = null) * Deletes all rows from the book table. * * @param PropelPDO $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). + * @return int The number of affected rows (if supported by underlying database driver). */ public static function doDeleteAll(PropelPDO $con = null) { @@ -621,7 +621,7 @@ public static function doDeleteAll(PropelPDO $con = null) * @param mixed $values Criteria or Book object or primary key or array of primary keys * which is used to create the DELETE statement * @param PropelPDO $con the connection to use - * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows * if supported by native driver or if emulated using Propel. * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. @@ -740,8 +740,8 @@ public static function retrieveByPK($pk, PropelPDO $con = null) /** * Retrieve multiple objects by pkey. * - * @param array $pks List of primary keys - * @param PropelPDO $con the connection to use + * @param array $pks List of primary keys + * @param PropelPDO $con the connection to use * @throws PropelException Any exceptions caught during processing will be * rethrown wrapped into a PropelException. */