diff --git a/tests/Query/MultipleAggregateValueTestCase.php b/tests/Query/MultipleAggregateValueTestCase.php index 4d5e275be..f94b4d701 100644 --- a/tests/Query/MultipleAggregateValueTestCase.php +++ b/tests/Query/MultipleAggregateValueTestCase.php @@ -48,7 +48,7 @@ class Doctrine_Query_MultipleAggregateValue_TestCase extends Doctrine_UnitTestCa public function testMultipleAggregateValues() { - $query = new Doctrine_Query(); + $query = new Doctrine_Query(); $query->select('u.*, COUNT(DISTINCT b.id) num_books, COUNT(DISTINCT a.id) num_albums'); $query->from('User u'); $query->leftJoin('u.Album a, u.Book b'); @@ -61,7 +61,7 @@ class Doctrine_Query_MultipleAggregateValue_TestCase extends Doctrine_UnitTestCa $name = $user->name; $num_albums = $user->Album[0]->num_albums; $num_books = $user->Book[0]->num_books; - } catch(Doctrine_Exception $e) { + } catch (Doctrine_Exception $e) { $this->fail(); } diff --git a/tests/Query/SubqueryTestCase.php b/tests/Query/SubqueryTestCase.php index cdd10ef9c..5162a229b 100644 --- a/tests/Query/SubqueryTestCase.php +++ b/tests/Query/SubqueryTestCase.php @@ -85,25 +85,25 @@ class Doctrine_Query_Subquery_TestCase extends Doctrine_UnitTestCase } - public function testGetLimitSubqueryOrderBy() - { - $query = new Doctrine_Query(); - $query->select('u.*, COUNT(DISTINCT a.id) num_albums'); - $query->from('User u, u.Album a'); - $query->orderby('num_albums'); + public function testGetLimitSubqueryOrderBy() + { + $query = new Doctrine_Query(); + $query->select('u.*, COUNT(DISTINCT a.id) num_albums'); + $query->from('User u, u.Album a'); + $query->orderby('num_albums'); + + try{ + // this causes getLimitSubquery() to be used, and it fails + $query->limit(5); - try{ - // this causes getLimitSubquery() to be used, and it fails - $query->limit(5); - - $users = $query->execute(); - - $count = $users->count(); - } catch(Doctrine_Exception $e) { - $this->fail(); - } + $users = $query->execute(); - $this->assertEqual($count, 1); + $count = $users->count(); + } catch (Doctrine_Exception $e) { + $this->fail(); } + + $this->assertEqual($count, 1); + } } ?>