RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-13 10:49:25 +03:00
Code Issues Projects Releases Wiki Activity

claar code from Scrutinizer

Browse Source
This commit is contained in:
ReenExe 2016-07-02 22:13:06 +03:00
parent ffd1465af2
commit 16cddd4693
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -1796,7 +1796,7 @@ class UnitOfWork implements PropertyChangedListener
* @throws ORMInvalidArgumentException If the entity instance is NEW. * @throws ORMInvalidArgumentException If the entity instance is NEW.
* @throws EntityNotFoundException * @throws EntityNotFoundException
*/ */
private function doMerge($entity, array &$visited, $prevManagedCopy = null, $assoc = null) private function doMerge($entity, array &$visited, $prevManagedCopy = null, array $assoc = [])
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);