Merge pull request doctrine#450 from KonstantinKuklin/master

fix some phpdoc
denisdeejay · Sep 21, 2012 · 831f0ac · 831f0ac
2 parents a9517b1 + 34d8843
commit 831f0ac
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 26 deletions.
diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php
@@ -69,7 +69,7 @@ abstract class AbstractQuery
     protected $parameters;
 
     /**
-     * @var ResultSetMapping The user-specified ResultSetMapping to use.
+     * @var \Doctrine\ORM\Query\ResultSetMapping The user-specified ResultSetMapping to use.
      */
     protected $_resultSetMapping;
 
@@ -293,7 +293,7 @@ private function convertObjectParameterToScalarValue($value)
     /**
      * Sets the ResultSetMapping that should be used for hydration.
      *
-     * @param ResultSetMapping $rsm
+     * @param \Doctrine\ORM\Query\ResultSetMapping $rsm
      * @return \Doctrine\ORM\AbstractQuery
      */
     public function setResultSetMapping(Query\ResultSetMapping $rsm)

diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -659,7 +659,7 @@ public function getNamingStrategy()
      * Set quote strategy.
      *
      * @since 2.3
-     * @param Doctrine\ORM\Mapping\QuoteStrategy $quoteStrategy
+     * @param \Doctrine\ORM\Mapping\QuoteStrategy $quoteStrategy
      */
     public function setQuoteStrategy(QuoteStrategy $quoteStrategy)
     {
@@ -670,7 +670,7 @@ public function setQuoteStrategy(QuoteStrategy $quoteStrategy)
      * Get quote strategy.
      *
      * @since 2.3
-     * @return Doctrine\ORM\Mapping\QuoteStrategy
+     * @return \Doctrine\ORM\Mapping\QuoteStrategy
      */
     public function getQuoteStrategy()
     {

diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php
@@ -114,7 +114,7 @@ class EntityManager implements ObjectManager
     /**
      * Collection of query filters.
      *
-     * @var Doctrine\ORM\Query\FilterCollection
+     * @var \Doctrine\ORM\Query\FilterCollection
      */
     private $filterCollection;
 

diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php
@@ -60,7 +60,7 @@ class EntityRepository implements ObjectRepository, Selectable
      * Initializes a new <tt>EntityRepository</tt>.
      *
      * @param EntityManager $em The EntityManager to use.
-     * @param ClassMetadata $classMetadata The class descriptor.
+     * @param Mapping\ClassMetadata $classMetadata The class descriptor.
      */
     public function __construct($em, Mapping\ClassMetadata $class)
     {

diff --git a/lib/Doctrine/ORM/Event/OnFlushEventArgs.php b/lib/Doctrine/ORM/Event/OnFlushEventArgs.php
@@ -33,7 +33,7 @@
 class OnFlushEventArgs extends \Doctrine\Common\EventArgs
 {
     /**
-     * @var Doctirne\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 

diff --git a/lib/Doctrine/ORM/Event/PreFlushEventArgs.php b/lib/Doctrine/ORM/Event/PreFlushEventArgs.php
@@ -31,7 +31,7 @@
 class PreFlushEventArgs extends \Doctrine\Common\EventArgs
 {
     /**
-     * @var EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $_em;
 
@@ -41,7 +41,7 @@ public function __construct($em)
     }
 
     /**
-     * @return EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {

diff --git a/lib/Doctrine/ORM/Id/AbstractIdGenerator.php b/lib/Doctrine/ORM/Id/AbstractIdGenerator.php
@@ -26,7 +26,7 @@ abstract class AbstractIdGenerator
     /**
      * Generates an identifier for an entity.
      *
-     * @param \Doctrine\ORM\Entity $entity
+     * @param \Doctrine\ORM\Mapping\Entity $entity
      * @return mixed
      */
     abstract public function generate(EntityManager $em, $entity);

diff --git a/lib/Doctrine/ORM/Query/FilterCollection.php b/lib/Doctrine/ORM/Query/FilterCollection.php
@@ -43,14 +43,14 @@ class FilterCollection
     /**
      * The used Configuration.
      *
-     * @var Doctrine\ORM\Configuration
+     * @var \Doctrine\ORM\Configuration
      */
     private $config;
 
     /**
      * The EntityManager that "owns" this FilterCollection instance.
      *
-     * @var Doctrine\ORM\EntityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $em;
 
@@ -99,7 +99,7 @@ public function getEnabledFilters()
      *
      * @throws \InvalidArgumentException If the filter does not exist.
      *
-     * @return SQLFilter The enabled filter.
+     * @return \Doctrine\ORM\Query\Filter\SQLFilter The enabled filter.
      */
     public function enable($name)
     {
@@ -125,7 +125,7 @@ public function enable($name)
      *
      * @param string $name Name of the filter.
      *
-     * @return SQLFilter The disabled filter.
+     * @return \Doctrine\ORM\Query\Filter\SQLFilter The disabled filter.
      *
      * @throws \InvalidArgumentException If the filter does not exist.
      */
@@ -147,7 +147,7 @@ public function disable($name)
      *
      * @param string $name Name of the filter.
      *
-     * @return SQLFilter The filter.
+     * @return \Doctrine\ORM\Query\Filter\SQLFilter The filter.
      *
      * @throws \InvalidArgumentException If the filter is not enabled.
      */

diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -92,7 +92,7 @@ class Parser
     /**
      * The EntityManager.
      *
-     * @var EnityManager
+     * @var \Doctrine\ORM\EntityManager
      */
     private $_em;
 
@@ -209,7 +209,7 @@ public function getParserResult()
     /**
      * Gets the EntityManager used by the parser.
      *
-     * @return EntityManager
+     * @return \Doctrine\ORM\EntityManager
      */
     public function getEntityManager()
     {

diff --git a/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php b/lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php
@@ -44,7 +44,7 @@ class EntityManagerHelper extends Helper
     /**
      * Constructor
      *
-     * @param Connection $connection Doctrine Database Connection
+     * @param \Doctrine\DBAL\Connection $connection Doctrine Database Connection
      */
     public function __construct(EntityManager $em)
     {

diff --git a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php
@@ -23,6 +23,7 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\UnitOfWork;
+use Doctrine\ORM\EntityManager;
 
 /**
  * Use this logger to dump the identity map during the onFlush event. This is useful for debugging

diff --git a/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php
@@ -30,12 +30,12 @@
 class CountOutputWalker extends SqlWalker
 {
     /**
-     * @var Doctrine\DBAL\Platforms\AbstractPlatform
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform
      */
     private $platform;
 
     /**
-     * @var Doctrine\ORM\Query\ResultSetMapping
+     * @var \Doctrine\ORM\Query\ResultSetMapping
      */
     private $rsm;
 
@@ -49,8 +49,8 @@ class CountOutputWalker extends SqlWalker
      * because Doctrine\ORM\Query\SqlWalker keeps everything private without
      * accessors.
      *
-     * @param Doctrine\ORM\Query $query
-     * @param Doctrine\ORM\Query\ParserResult $parserResult
+     * @param \Doctrine\ORM\Query $query
+     * @param \Doctrine\ORM\Query\ParserResult $parserResult
      * @param array $queryComponents
      */
     public function __construct($query, $parserResult, array $queryComponents)

diff --git a/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
@@ -30,12 +30,12 @@
 class LimitSubqueryOutputWalker extends SqlWalker
 {
     /**
-     * @var Doctrine\DBAL\Platforms\AbstractPlatform
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform
      */
     private $platform;
 
     /**
-     * @var Doctrine\ORM\Query\ResultSetMapping
+     * @var \Doctrine\ORM\Query\ResultSetMapping
      */
     private $rsm;
 
@@ -59,8 +59,8 @@ class LimitSubqueryOutputWalker extends SqlWalker
      * because Doctrine\ORM\Query\SqlWalker keeps everything private without
      * accessors.
      *
-     * @param Doctrine\ORM\Query $query
-     * @param Doctrine\ORM\Query\ParserResult $parserResult
+     * @param \Doctrine\ORM\Query $query
+     * @param \Doctrine\ORM\Query\ParserResult $parserResult
      * @param array $queryComponents
      */
     public function __construct($query, $parserResult, array $queryComponents)