RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 20:11:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #450 from KonstantinKuklin/master

Browse Source 
fix some phpdoc
This commit is contained in:
Guilherme Blanco 2012-09-20 18:10:22 -07:00
commit 831f0acdc5
13 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -69,7 +69,7 @@ abstract class AbstractQuery
protected $parameters; protected $parameters;
/** /**
* @var ResultSetMapping The user-specified ResultSetMapping to use. * @var \Doctrine\ORM\Query\ResultSetMapping The user-specified ResultSetMapping to use.
*/ */
protected $_resultSetMapping; protected $_resultSetMapping;
@ -293,7 +293,7 @@ abstract class AbstractQuery
/** /**
* Sets the ResultSetMapping that should be used for hydration. * Sets the ResultSetMapping that should be used for hydration.
* *
* @param ResultSetMapping $rsm * @param \Doctrine\ORM\Query\ResultSetMapping $rsm
* @return \Doctrine\ORM\AbstractQuery * @return \Doctrine\ORM\AbstractQuery
*/ */
public function setResultSetMapping(Query\ResultSetMapping $rsm) public function setResultSetMapping(Query\ResultSetMapping $rsm)

4
lib/Doctrine/ORM/Configuration.php
View File

@ -659,7 +659,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
* Set quote strategy. * Set quote strategy.
* *
* @since 2.3 * @since 2.3
* @param Doctrine\ORM\Mapping\QuoteStrategy $quoteStrategy * @param \Doctrine\ORM\Mapping\QuoteStrategy $quoteStrategy
*/ */
public function setQuoteStrategy(QuoteStrategy $quoteStrategy) public function setQuoteStrategy(QuoteStrategy $quoteStrategy)
{ {
@ -670,7 +670,7 @@ class Configuration extends \Doctrine\DBAL\Configuration
* Get quote strategy. * Get quote strategy.
* *
* @since 2.3 * @since 2.3
* @return Doctrine\ORM\Mapping\QuoteStrategy * @return \Doctrine\ORM\Mapping\QuoteStrategy
*/ */
public function getQuoteStrategy() public function getQuoteStrategy()
{ {

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

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

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

@ -60,7 +60,7 @@ class EntityRepository implements ObjectRepository, Selectable
* Initializes a new <tt>EntityRepository</tt>. * Initializes a new <tt>EntityRepository</tt>.
* *
* @param EntityManager $em The EntityManager to use. * @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) public function __construct($em, Mapping\ClassMetadata $class)
{ {

2
lib/Doctrine/ORM/Event/OnFlushEventArgs.php
View File

@ -33,7 +33,7 @@ use Doctrine\ORM\EntityManager;
class OnFlushEventArgs extends \Doctrine\Common\EventArgs class OnFlushEventArgs extends \Doctrine\Common\EventArgs
{ {
/** /**
* @var Doctirne\ORM\EntityManager * @var \Doctrine\ORM\EntityManager
*/ */
private $em; private $em;

4
lib/Doctrine/ORM/Event/PreFlushEventArgs.php
View File

@ -31,7 +31,7 @@ namespace Doctrine\ORM\Event;
class PreFlushEventArgs extends \Doctrine\Common\EventArgs class PreFlushEventArgs extends \Doctrine\Common\EventArgs
{ {
/** /**
* @var EntityManager * @var \Doctrine\ORM\EntityManager
*/ */
private $_em; private $_em;
@ -41,7 +41,7 @@ class PreFlushEventArgs extends \Doctrine\Common\EventArgs
} }
/** /**
* @return EntityManager * @return \Doctrine\ORM\EntityManager
*/ */
public function getEntityManager() public function getEntityManager()
{ {

2
lib/Doctrine/ORM/Id/AbstractIdGenerator.php
View File

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

10
lib/Doctrine/ORM/Query/FilterCollection.php
View File

@ -43,14 +43,14 @@ class FilterCollection
/** /**
* The used Configuration. * The used Configuration.
* *
* @var Doctrine\ORM\Configuration * @var \Doctrine\ORM\Configuration
*/ */
private $config; private $config;
/** /**
* The EntityManager that "owns" this FilterCollection instance. * The EntityManager that "owns" this FilterCollection instance.
* *
* @var Doctrine\ORM\EntityManager * @var \Doctrine\ORM\EntityManager
*/ */
private $em; private $em;
@ -99,7 +99,7 @@ class FilterCollection
* *
* @throws \InvalidArgumentException If the filter does not exist. * @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) public function enable($name)
{ {
@ -125,7 +125,7 @@ class FilterCollection
* *
* @param string $name Name of the filter. * @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. * @throws \InvalidArgumentException If the filter does not exist.
*/ */
@ -147,7 +147,7 @@ class FilterCollection
* *
* @param string $name Name of the filter. * @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. * @throws \InvalidArgumentException If the filter is not enabled.
*/ */

4
lib/Doctrine/ORM/Query/Parser.php
View File

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

2
lib/Doctrine/ORM/Tools/Console/Helper/EntityManagerHelper.php
View File

@ -44,7 +44,7 @@ class EntityManagerHelper extends Helper
/** /**
* Constructor * Constructor
* *
* @param Connection $connection Doctrine Database Connection * @param \Doctrine\DBAL\Connection $connection Doctrine Database Connection
*/ */
public function __construct(EntityManager $em) public function __construct(EntityManager $em)
{ {

1
lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php
View File

@ -23,6 +23,7 @@ use Doctrine\ORM\Event\OnFlushEventArgs;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\UnitOfWork; 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 * Use this logger to dump the identity map during the onFlush event. This is useful for debugging

8
lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php
View File

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

8
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php
View File

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