#1573 - correcting docblock arguments/description

Ocramius · Ocramius · commit 596e8957635a · 2015-12-11T20:18:42.000+01:00
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -1909,9 +1909,9 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass
     }
 
     /**
-     * Tests if an entity is loaded (Not a proxy or a non initialized proxy)
+     * Tests if an entity is loaded - must either be a loaded proxy or not a proxy
      *
-     * @param $entity
+     * @param object $entity
      *
      * @return bool
      */

Original file line number	Diff line number	Diff line change
`@@ -1909,9 +1909,9 @@ private function doMerge($entity, array &$visited, $prevManagedCopy = null, $ass`
`1909`	`1909`	`}`
`1910`	`1910`
`1911`	`1911`	`/**`
`1912`		`- * Tests if an entity is loaded (Not a proxy or a non initialized proxy)`
	`1912`	`+ * Tests if an entity is loaded - must either be a loaded proxy or not a proxy`
`1913`	`1913`	`*`
`1914`		`- * @param $entity`
	`1914`	`+ * @param object $entity`
`1915`	`1915`	`*`
`1916`	`1916`	`* @return bool`
`1917`	`1917`	`*/`