Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HHVM compatibility: func_get_args #790

Merged
merged 1 commit into from
Sep 15, 2013
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/QueryBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -894,8 +894,8 @@ public function where($predicates)
*/
public function andWhere($where)
{
$where = $this->getDQLPart('where');
$args = func_get_args();
$where = $this->getDQLPart('where');

if ($where instanceof Expr\Andx) {
$where->addMultiple($args);
Expand Down Expand Up @@ -927,8 +927,8 @@ public function andWhere($where)
*/
public function orWhere($where)
{
$where = $this->getDqlPart('where');
$args = func_get_args();
$where = $this->getDqlPart('where');

if ($where instanceof Expr\Orx) {
$where->addMultiple($args);
Expand Down Expand Up @@ -1007,8 +1007,8 @@ public function having($having)
*/
public function andHaving($having)
{
$having = $this->getDqlPart('having');
$args = func_get_args();
$having = $this->getDqlPart('having');

if ($having instanceof Expr\Andx) {
$having->addMultiple($args);
Expand All @@ -1030,8 +1030,8 @@ public function andHaving($having)
*/
public function orHaving($having)
{
$having = $this->getDqlPart('having');
$args = func_get_args();
$having = $this->getDqlPart('having');

if ($having instanceof Expr\Orx) {
$having->addMultiple($args);
Expand Down