RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-15 11:43:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7363 from philippe-unitiz/2.6

Browse Source 
Fix compatibility with phan
This commit is contained in:
Michael Moravec 2018-09-23 05:16:52 +02:00 committed by GitHub
commit 899cce8094
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Doctrine/ORM/Query/Expr.php
View File

@ -41,10 +41,8 @@ class Expr
* // (u.type = ?1) AND (u.role = ?2) * // (u.type = ?1) AND (u.role = ?2)
* $expr->andX($expr->eq('u.type', ':1'), $expr->eq('u.role', ':2')); * $expr->andX($expr->eq('u.type', ':1'), $expr->eq('u.role', ':2'));
* *
* @param \Doctrine\ORM\Query\Expr\Comparison | * @param Expr\Comparison|Expr\Func|Expr\Orx $x Optional clause. Defaults to null, but requires at least one
* \Doctrine\ORM\Query\Expr\Func | * defined when converting to string.
* \Doctrine\ORM\Query\Expr\Orx
* $x Optional clause. Defaults to null, but requires at least one defined when converting to string.
* *
* @return Expr\Andx * @return Expr\Andx
*/ */

2
lib/Doctrine/ORM/Query/Expr/Base.php
View File

@ -56,7 +56,7 @@ abstract class Base
protected $parts = []; protected $parts = [];
/** /**
* @param array $args * @param mixed $args
*/ */
public function __construct($args = []) public function __construct($args = [])
{ {