RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1142 from TwoWholeWorms/2.4

Browse Source 
func_get_args() call order fix for HHVM bug
This commit is contained in:
Marco Pivetta 2014-09-22 23:43:46 +02:00
commit a50ae2c898
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/QueryBuilder.php
View File

@ -894,8 +894,8 @@ class QueryBuilder
*/ */
public function andWhere($where) public function andWhere($where)
{ {
$where = $this->getDQLPart('where');
$args = func_get_args(); $args = func_get_args();
$where = $this->getDQLPart('where');
if ($where instanceof Expr\Andx) { if ($where instanceof Expr\Andx) {
$where->addMultiple($args); $where->addMultiple($args);
@ -927,8 +927,8 @@ class QueryBuilder
*/ */
public function orWhere($where) public function orWhere($where)
{ {
$where = $this->getDqlPart('where');
$args = func_get_args(); $args = func_get_args();
$where = $this->getDqlPart('where');
if ($where instanceof Expr\Orx) { if ($where instanceof Expr\Orx) {
$where->addMultiple($args); $where->addMultiple($args);
@ -1007,8 +1007,8 @@ class QueryBuilder
*/ */
public function andHaving($having) public function andHaving($having)
{ {
$having = $this->getDqlPart('having');
$args = func_get_args(); $args = func_get_args();
$having = $this->getDqlPart('having');
if ($having instanceof Expr\Andx) { if ($having instanceof Expr\Andx) {
$having->addMultiple($args); $having->addMultiple($args);
@ -1030,8 +1030,8 @@ class QueryBuilder
*/ */
public function orHaving($having) public function orHaving($having)
{ {
$having = $this->getDqlPart('having');
$args = func_get_args(); $args = func_get_args();
$having = $this->getDqlPart('having');
if ($having instanceof Expr\Orx) { if ($having instanceof Expr\Orx) {
$having->addMultiple($args); $having->addMultiple($args);