From 12c3a42d8cc9193cf1fba55ca25e9088b428c53b Mon Sep 17 00:00:00 2001
From: Jan Dolecek <juzna.cz@gmail.com>
Date: Fri, 30 Dec 2011 18:40:19 +0100
Subject: [PATCH] fixed phpDoc and typos

---
 lib/Doctrine/ORM/AbstractQuery.php                       | 2 +-
 lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php | 9 +++++----
 lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php   | 4 ++--
 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php           | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
index 3fe27f93b..d57e6335a 100644
--- a/lib/Doctrine/ORM/AbstractQuery.php
+++ b/lib/Doctrine/ORM/AbstractQuery.php
@@ -605,7 +605,7 @@ abstract class AbstractQuery
 
     /**
      * Set the result cache id to use to store the result set cache entry.
-     * If this is not explicitely set by the developer then a hash is automatically
+     * If this is not explicitly set by the developer then a hash is automatically
      * generated for you.
      *
      * @param string $id
diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
index a0a71922a..b58bfb933 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -36,22 +36,22 @@ use PDO,
  */
 abstract class AbstractHydrator
 {
-    /** @var ResultSetMapping The ResultSetMapping. */
+    /** @var \Doctrine\ORM\Query\ResultSetMapping The ResultSetMapping. */
     protected $_rsm;
 
     /** @var EntityManager The EntityManager instance. */
     protected $_em;
 
-    /** @var AbstractPlatform The dbms Platform instance */
+    /** @var \Doctrine\DBAL\Platforms\AbstractPlatform The dbms Platform instance */
     protected $_platform;
 
-    /** @var UnitOfWork The UnitOfWork of the associated EntityManager. */
+    /** @var \Doctrine\ORM\UnitOfWork The UnitOfWork of the associated EntityManager. */
     protected $_uow;
 
     /** @var array The cache used during row-by-row hydration. */
     protected $_cache = array();
 
-    /** @var Statement The statement that provides the data to hydrate. */
+    /** @var \Doctrine\DBAL\Driver\Statement The statement that provides the data to hydrate. */
     protected $_stmt;
 
     /** @var array The query hints. */
@@ -93,6 +93,7 @@ abstract class AbstractHydrator
      *
      * @param object $stmt
      * @param object $resultSetMapping
+     * @param array $hints
      * @return mixed
      */
     public function hydrateAll($stmt, $resultSetMapping, array $hints = array())
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
index 838e9ef8c..5595727b0 100644
--- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
+++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -208,8 +208,8 @@ class ObjectHydrator extends AbstractHydrator
     /**
      * Gets an entity instance.
      *
-     * @param $data The instance data.
-     * @param $dqlAlias The DQL alias of the entity's class.
+     * @param array $data The instance data.
+     * @param string $dqlAlias The DQL alias of the entity's class.
      * @return object The entity.
      */
     private function _getEntity(array $data, $dqlAlias)
diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
index 6fbf8b3c6..9e2447acd 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -422,7 +422,7 @@ class ClassMetadataInfo
     /**
      * READ-ONLY: The ID generator used for generating IDs for this class.
      *
-     * @var AbstractIdGenerator
+     * @var \Doctrine\ORM\Id\AbstractIdGenerator
      * @todo Remove!
      */
     public $idGenerator;