Merge pull request #7190 from Tobion/patch-1

Fix wrong type in phpdoc of AbstractIdGenerator

lib/Doctrine/ORM/Id/AbstractIdGenerator.php

@@ -27,7 +27,7 @@ abstract class AbstractIdGenerator
      * Generates an identifier for an entity.
      *
      * @param EntityManager $em
-     * @param \Doctrine\ORM\Mapping\Entity $entity
+     * @param object|null $entity
      * @return mixed
      */
     abstract public function generate(EntityManager $em, $entity);