Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

DDC-1025 - Absolute Namespace Annotations #216

Merged
merged 2 commits into from over 2 years ago

3 participants

Andrew Mackrodt Oleg Stepura Benjamin Eberlei
Andrew Mackrodt

Request pull into master using proper procedure this time:
#215


A regex replace over phpdoc annotations to use absolute (i.e. \Doctrine) namespace references, described in issue DDC-1025 - http://www.doctrine-project.org/jira/browse/DDC-1025

This should fix code completion in multiple IDEs including PhpStorm.

Benjamin Eberlei beberlei merged commit bda9815 into from December 11, 2011
Benjamin Eberlei beberlei closed this December 11, 2011
Oleg Stepura

Finally! Thanks a lot for this change! IDEA seems to be fixing it's behaviour forever!

elHornair elHornair referenced this pull request from a commit February 22, 2013
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.

Showing 39 changed files with 153 additions and 153 deletions. Show diff stats Hide diff stats

  1. 32  lib/Doctrine/ORM/AbstractQuery.php
  2. 2  lib/Doctrine/ORM/Configuration.php
  3. 46  lib/Doctrine/ORM/EntityManager.php
  4. 2  lib/Doctrine/ORM/EntityRepository.php
  5. 2  lib/Doctrine/ORM/Event/EntityEventDelegator.php
  6. 6  lib/Doctrine/ORM/Event/LifecycleEventArgs.php
  7. 12  lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
  8. 6  lib/Doctrine/ORM/Event/OnClearEventArgs.php
  9. 4  lib/Doctrine/ORM/Event/OnFlushEventArgs.php
  10. 6  lib/Doctrine/ORM/Event/PostFlushEventArgs.php
  11. 2  lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
  12. 2  lib/Doctrine/ORM/Id/AbstractIdGenerator.php
  13. 2  lib/Doctrine/ORM/Id/SequenceGenerator.php
  14. 4  lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
  15. 2  lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
  16. 4  lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
  17. 22  lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
  18. 4  lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
  19. 2  lib/Doctrine/ORM/Mapping/JoinColumns.php
  20. 4  lib/Doctrine/ORM/Mapping/JoinTable.php
  21. 2  lib/Doctrine/ORM/Mapping/NamedQueries.php
  22. 4  lib/Doctrine/ORM/Mapping/Table.php
  23. 6  lib/Doctrine/ORM/PersistentCollection.php
  24. 6  lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
  25. 22  lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
  26. 2  lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
  27. 2  lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
  28. 22  lib/Doctrine/ORM/Query.php
  29. 4  lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php
  30. 6  lib/Doctrine/ORM/Query/Expr.php
  31. 4  lib/Doctrine/ORM/Query/ParameterTypeInferer.php
  32. 28  lib/Doctrine/ORM/Query/Parser.php
  33. 2  lib/Doctrine/ORM/Query/QueryException.php
  34. 2  lib/Doctrine/ORM/Query/SqlWalker.php
  35. 4  lib/Doctrine/ORM/Query/TreeWalkerAdapter.php
  36. 2  lib/Doctrine/ORM/Tools/Console/Command/InfoCommand.php
  37. 2  lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
  38. 4  lib/Doctrine/ORM/Tools/SchemaTool.php
  39. 16  lib/Doctrine/ORM/UnitOfWork.php
32  lib/Doctrine/ORM/AbstractQuery.php
@@ -77,7 +77,7 @@
77 77
     protected $_resultSetMapping;
78 78
 
79 79
     /**
80  
-     * @var Doctrine\ORM\EntityManager The entity manager used by this query object.
  80
+     * @var \Doctrine\ORM\EntityManager The entity manager used by this query object.
81 81
      */
82 82
     protected $_em;
83 83
 
@@ -104,7 +104,7 @@
104 104
     /**
105 105
      * Initializes a new instance of a class derived from <tt>AbstractQuery</tt>.
106 106
      *
107  
-     * @param Doctrine\ORM\EntityManager $entityManager
  107
+     * @param \Doctrine\ORM\EntityManager $entityManager
108 108
      */
109 109
     public function __construct(EntityManager $em)
110 110
     {
@@ -114,7 +114,7 @@ public function __construct(EntityManager $em)
114 114
     /**
115 115
      * Retrieves the associated EntityManager of this Query instance.
116 116
      *
117  
-     * @return Doctrine\ORM\EntityManager
  117
+     * @return \Doctrine\ORM\EntityManager
118 118
      */
119 119
     public function getEntityManager()
120 120
     {
@@ -202,7 +202,7 @@ public function getParameterType($key)
202 202
      * @param string $type The parameter type. If specified, the given value will be run through
203 203
      *                     the type conversion of this type. This is usually not needed for
204 204
      *                     strings and numeric types.
205  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  205
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
206 206
      */
207 207
     public function setParameter($key, $value, $type = null)
208 208
     {
@@ -223,7 +223,7 @@ public function setParameter($key, $value, $type = null)
223 223
      *
224 224
      * @param array $params
225 225
      * @param array $types
226  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  226
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
227 227
      */
228 228
     public function setParameters(array $params, array $types = array())
229 229
     {
@@ -238,7 +238,7 @@ public function setParameters(array $params, array $types = array())
238 238
      * Sets the ResultSetMapping that should be used for hydration.
239 239
      *
240 240
      * @param ResultSetMapping $rsm
241  
-     * @return Doctrine\ORM\AbstractQuery
  241
+     * @return \Doctrine\ORM\AbstractQuery
242 242
      */
243 243
     public function setResultSetMapping(Query\ResultSetMapping $rsm)
244 244
     {
@@ -250,8 +250,8 @@ public function setResultSetMapping(Query\ResultSetMapping $rsm)
250 250
     /**
251 251
      * Defines a cache driver to be used for caching result sets and implictly enables caching.
252 252
      *
253  
-     * @param Doctrine\Common\Cache\Cache $driver Cache driver
254  
-     * @return Doctrine\ORM\AbstractQuery
  253
+     * @param \Doctrine\Common\Cache\Cache $driver Cache driver
  254
+     * @return \Doctrine\ORM\AbstractQuery
255 255
      */
256 256
     public function setResultCacheDriver($resultCacheDriver = null)
257 257
     {
@@ -270,7 +270,7 @@ public function setResultCacheDriver($resultCacheDriver = null)
270 270
      * Returns the cache driver used for caching result sets.
271 271
      *
272 272
      * @deprecated
273  
-     * @return Doctrine\Common\Cache\Cache Cache driver
  273
+     * @return \Doctrine\Common\Cache\Cache Cache driver
274 274
      */
275 275
     public function getResultCacheDriver()
276 276
     {
@@ -288,7 +288,7 @@ public function getResultCacheDriver()
288 288
      * @param boolean $bool
289 289
      * @param integer $lifetime
290 290
      * @param string $resultCacheId
291  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  291
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
292 292
      */
293 293
     public function useResultCache($bool, $lifetime = null, $resultCacheId = null)
294 294
     {
@@ -308,7 +308,7 @@ public function useResultCache($bool, $lifetime = null, $resultCacheId = null)
308 308
      * Defines how long the result cache will be active before expire.
309 309
      *
310 310
      * @param integer $lifetime How long the cache entry is valid.
311  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  311
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
312 312
      */
313 313
     public function setResultCacheLifetime($lifetime)
314 314
     {
@@ -336,7 +336,7 @@ public function getResultCacheLifetime()
336 336
      * Defines if the result cache is active or not.
337 337
      *
338 338
      * @param boolean $expire Whether or not to force resultset cache expiration.
339  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  339
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
340 340
      */
341 341
     public function expireResultCache($expire = true)
342 342
     {
@@ -389,7 +389,7 @@ public function setFetchMode($class, $assocName, $fetchMode)
389 389
      *
390 390
      * @param integer $hydrationMode Doctrine processing mode to be used during hydration process.
391 391
      *                               One of the Query::HYDRATE_* constants.
392  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  392
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
393 393
      */
394 394
     public function setHydrationMode($hydrationMode)
395 395
     {
@@ -520,7 +520,7 @@ public function getSingleScalarResult()
520 520
      *
521 521
      * @param string $name The name of the hint.
522 522
      * @param mixed $value The value of the hint.
523  
-     * @return Doctrine\ORM\AbstractQuery
  523
+     * @return \Doctrine\ORM\AbstractQuery
524 524
      */
525 525
     public function setHint($name, $value)
526 526
     {
@@ -609,7 +609,7 @@ public function execute($params = array(), $hydrationMode = null)
609 609
      * generated for you.
610 610
      *
611 611
      * @param string $id
612  
-     * @return Doctrine\ORM\AbstractQuery This query instance.
  612
+     * @return \Doctrine\ORM\AbstractQuery This query instance.
613 613
      */
614 614
     public function setResultCacheId($id)
615 615
     {
@@ -634,7 +634,7 @@ public function getResultCacheId()
634 634
     /**
635 635
      * Executes the query and returns a the resulting Statement object.
636 636
      *
637  
-     * @return Doctrine\DBAL\Driver\Statement The executed database statement that holds the results.
  637
+     * @return \Doctrine\DBAL\Driver\Statement The executed database statement that holds the results.
638 638
      */
639 639
     abstract protected function _doExecute();
640 640
 
2  lib/Doctrine/ORM/Configuration.php
@@ -501,7 +501,7 @@ public function getClassMetadataFactoryName()
501 501
      * 
502 502
      * @since 2.2
503 503
      * @param string $className
504  
-     * @throws ORMException If not is a Doctrine\ORM\EntityRepository
  504
+     * @throws ORMException If not is a \Doctrine\ORM\EntityRepository
505 505
      */
506 506
     public function setDefaultRepositoryClassName($className)
507 507
     {
46  lib/Doctrine/ORM/EntityManager.php
@@ -43,21 +43,21 @@ class EntityManager implements ObjectManager
43 43
     /**
44 44
      * The used Configuration.
45 45
      *
46  
-     * @var Doctrine\ORM\Configuration
  46
+     * @var \Doctrine\ORM\Configuration
47 47
      */
48 48
     private $config;
49 49
 
50 50
     /**
51 51
      * The database connection used by the EntityManager.
52 52
      *
53  
-     * @var Doctrine\DBAL\Connection
  53
+     * @var \Doctrine\DBAL\Connection
54 54
      */
55 55
     private $conn;
56 56
 
57 57
     /**
58 58
      * The metadata factory, used to retrieve the ORM metadata of entity classes.
59 59
      *
60  
-     * @var Doctrine\ORM\Mapping\ClassMetadataFactory
  60
+     * @var \Doctrine\ORM\Mapping\ClassMetadataFactory
61 61
      */
62 62
     private $metadataFactory;
63 63
 
@@ -71,14 +71,14 @@ class EntityManager implements ObjectManager
71 71
     /**
72 72
      * The UnitOfWork used to coordinate object-level transactions.
73 73
      *
74  
-     * @var Doctrine\ORM\UnitOfWork
  74
+     * @var \Doctrine\ORM\UnitOfWork
75 75
      */
76 76
     private $unitOfWork;
77 77
 
78 78
     /**
79 79
      * The event manager that is the central point of the event system.
80 80
      *
81  
-     * @var Doctrine\Common\EventManager
  81
+     * @var \Doctrine\Common\EventManager
82 82
      */
83 83
     private $eventManager;
84 84
 
@@ -92,14 +92,14 @@ class EntityManager implements ObjectManager
92 92
     /**
93 93
      * The proxy factory used to create dynamic proxies.
94 94
      *
95  
-     * @var Doctrine\ORM\Proxy\ProxyFactory
  95
+     * @var \Doctrine\ORM\Proxy\ProxyFactory
96 96
      */
97 97
     private $proxyFactory;
98 98
 
99 99
     /**
100 100
      * The expression builder instance used to generate query expressions.
101 101
      *
102  
-     * @var Doctrine\ORM\Query\Expr
  102
+     * @var \Doctrine\ORM\Query\Expr
103 103
      */
104 104
     private $expressionBuilder;
105 105
 
@@ -114,9 +114,9 @@ class EntityManager implements ObjectManager
114 114
      * Creates a new EntityManager that operates on the given database connection
115 115
      * and uses the given Configuration and EventManager implementations.
116 116
      *
117  
-     * @param Doctrine\DBAL\Connection $conn
118  
-     * @param Doctrine\ORM\Configuration $config
119  
-     * @param Doctrine\Common\EventManager $eventManager
  117
+     * @param \Doctrine\DBAL\Connection $conn
  118
+     * @param \Doctrine\ORM\Configuration $config
  119
+     * @param \Doctrine\Common\EventManager $eventManager
120 120
      */
121 121
     protected function __construct(Connection $conn, Configuration $config, EventManager $eventManager)
122 122
     {
@@ -141,7 +141,7 @@ protected function __construct(Connection $conn, Configuration $config, EventMan
141 141
     /**
142 142
      * Gets the database connection object used by the EntityManager.
143 143
      *
144  
-     * @return Doctrine\DBAL\Connection
  144
+     * @return \Doctrine\DBAL\Connection
145 145
      */
146 146
     public function getConnection()
147 147
     {
@@ -151,7 +151,7 @@ public function getConnection()
151 151
     /**
152 152
      * Gets the metadata factory used to gather the metadata of classes.
153 153
      *
154  
-     * @return Doctrine\ORM\Mapping\ClassMetadataFactory
  154
+     * @return \Doctrine\ORM\Mapping\ClassMetadataFactory
155 155
      */
156 156
     public function getMetadataFactory()
157 157
     {
@@ -170,7 +170,7 @@ public function getMetadataFactory()
170 170
      *         ->where($expr->orX($expr->eq('u.id', 1), $expr->eq('u.id', 2)));
171 171
      * </code>
172 172
      *
173  
-     * @return Doctrine\ORM\Query\Expr
  173
+     * @return \Doctrine\ORM\Query\Expr
174 174
      */
175 175
     public function getExpressionBuilder()
176 176
     {
@@ -253,7 +253,7 @@ public function rollback()
253 253
      * MyProject\Domain\User
254 254
      * sales:PriceRequest
255 255
      *
256  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  256
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
257 257
      * @internal Performance-sensitive method.
258 258
      */
259 259
     public function getClassMetadata($className)
@@ -265,7 +265,7 @@ public function getClassMetadata($className)
265 265
      * Creates a new Query object.
266 266
      *
267 267
      * @param string  The DQL string.
268  
-     * @return Doctrine\ORM\Query
  268
+     * @return \Doctrine\ORM\Query
269 269
      */
270 270
     public function createQuery($dql = "")
271 271
     {
@@ -282,7 +282,7 @@ public function createQuery($dql = "")
282 282
      * Creates a Query from a named query.
283 283
      *
284 284
      * @param string $name
285  
-     * @return Doctrine\ORM\Query
  285
+     * @return \Doctrine\ORM\Query
286 286
      */
287 287
     public function createNamedQuery($name)
288 288
     {
@@ -309,7 +309,7 @@ public function createNativeQuery($sql, ResultSetMapping $rsm)
309 309
      * Creates a NativeQuery from a named native query.
310 310
      *
311 311
      * @param string $name
312  
-     * @return Doctrine\ORM\NativeQuery
  312
+     * @return \Doctrine\ORM\NativeQuery
313 313
      */
314 314
     public function createNamedNativeQuery($name)
315 315
     {
@@ -337,7 +337,7 @@ public function createQueryBuilder()
337 337
      * the cascade-persist semantics + scheduled inserts/removals are synchronized.
338 338
      *
339 339
      * @param object $entity
340  
-     * @throws Doctrine\ORM\OptimisticLockException If a version check on an entity that
  340
+     * @throws \Doctrine\ORM\OptimisticLockException If a version check on an entity that
341 341
      *         makes use of optimistic locking fails.
342 342
      */
343 343
     public function flush($entity = null)
@@ -632,7 +632,7 @@ public function contains($entity)
632 632
     /**
633 633
      * Gets the EventManager used by the EntityManager.
634 634
      *
635  
-     * @return Doctrine\Common\EventManager
  635
+     * @return \Doctrine\Common\EventManager
636 636
      */
637 637
     public function getEventManager()
638 638
     {
@@ -642,7 +642,7 @@ public function getEventManager()
642 642
     /**
643 643
      * Gets the Configuration used by the EntityManager.
644 644
      *
645  
-     * @return Doctrine\ORM\Configuration
  645
+     * @return \Doctrine\ORM\Configuration
646 646
      */
647 647
     public function getConfiguration()
648 648
     {
@@ -674,7 +674,7 @@ public function isOpen()
674 674
     /**
675 675
      * Gets the UnitOfWork used by the EntityManager to coordinate operations.
676 676
      *
677  
-     * @return Doctrine\ORM\UnitOfWork
  677
+     * @return \Doctrine\ORM\UnitOfWork
678 678
      */
679 679
     public function getUnitOfWork()
680 680
     {
@@ -688,7 +688,7 @@ public function getUnitOfWork()
688 688
      * selectively iterate over the result.
689 689
      *
690 690
      * @param int $hydrationMode
691  
-     * @return Doctrine\ORM\Internal\Hydration\AbstractHydrator
  691
+     * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
692 692
      */
693 693
     public function getHydrator($hydrationMode)
694 694
     {
@@ -703,7 +703,7 @@ public function getHydrator($hydrationMode)
703 703
      * Create a new instance for the given hydration mode.
704 704
      *
705 705
      * @param  int $hydrationMode
706  
-     * @return Doctrine\ORM\Internal\Hydration\AbstractHydrator
  706
+     * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
707 707
      */
708 708
     public function newHydrator($hydrationMode)
709 709
     {
2  lib/Doctrine/ORM/EntityRepository.php
@@ -48,7 +48,7 @@ class EntityRepository implements ObjectRepository
48 48
     protected $_em;
49 49
 
50 50
     /**
51  
-     * @var Doctrine\ORM\Mapping\ClassMetadata
  51
+     * @var \Doctrine\ORM\Mapping\ClassMetadata
52 52
      */
53 53
     protected $_class;
54 54
 
2  lib/Doctrine/ORM/Event/EntityEventDelegator.php
@@ -80,7 +80,7 @@ public function addEventListener($events, $entities, $listener)
80 80
      * Adds an EventSubscriber. The subscriber is asked for all the events he is
81 81
      * interested in and added as a listener for these events.
82 82
      *
83  
-     * @param Doctrine\Common\EventSubscriber $subscriber The subscriber.
  83
+     * @param \Doctrine\Common\EventSubscriber $subscriber The subscriber.
84 84
      * @param array $entities
85 85
      */
86 86
     public function addEventSubscriber(EventSubscriber $subscriber, $entities)
6  lib/Doctrine/ORM/Event/LifecycleEventArgs.php
@@ -34,7 +34,7 @@
34 34
 class LifecycleEventArgs extends EventArgs
35 35
 {
36 36
     /**
37  
-     * @var Doctrine\ORM\EntityManager
  37
+     * @var \Doctrine\ORM\EntityManager
38 38
      */
39 39
     private $em;
40 40
 
@@ -47,7 +47,7 @@ class LifecycleEventArgs extends EventArgs
47 47
      * Constructor
48 48
      * 
49 49
      * @param object $entity
50  
-     * @param Doctrine\ORM\EntityManager $em 
  50
+     * @param \Doctrine\ORM\EntityManager $em
51 51
      */
52 52
     public function __construct($entity, EntityManager $em)
53 53
     {
@@ -68,7 +68,7 @@ public function getEntity()
68 68
     /**
69 69
      * Retrieve associated EntityManager.
70 70
      * 
71  
-     * @return Doctrine\ORM\EntityManager
  71
+     * @return \Doctrine\ORM\EntityManager
72 72
      */
73 73
     public function getEntityManager()
74 74
     {
12  lib/Doctrine/ORM/Event/LoadClassMetadataEventArgs.php
@@ -32,20 +32,20 @@
32 32
 class LoadClassMetadataEventArgs extends EventArgs
33 33
 {
34 34
     /**
35  
-     * @var Doctrine\ORM\Mapping\ClassMetadata
  35
+     * @var \Doctrine\ORM\Mapping\ClassMetadata
36 36
      */
37 37
     private $classMetadata;
38 38
 
39 39
     /**
40  
-     * @var Doctrine\ORM\EntityManager
  40
+     * @var \Doctrine\ORM\EntityManager
41 41
      */
42 42
     private $em;
43 43
 
44 44
     /**
45 45
      * Constructor.
46 46
      * 
47  
-     * @param Doctrine\ORM\Mapping\ClassMetadataInfo $classMetadata
48  
-     * @param Doctrine\ORM\EntityManager $em
  47
+     * @param \Doctrine\ORM\Mapping\ClassMetadataInfo $classMetadata
  48
+     * @param \Doctrine\ORM\EntityManager $em
49 49
      */
50 50
     public function __construct(ClassMetadataInfo $classMetadata, EntityManager $em)
51 51
     {
@@ -56,7 +56,7 @@ public function __construct(ClassMetadataInfo $classMetadata, EntityManager $em)
56 56
     /**
57 57
      * Retrieve associated ClassMetadata.
58 58
      *  
59  
-     * @return Doctrine\ORM\Mapping\ClassMetadataInfo
  59
+     * @return \Doctrine\ORM\Mapping\ClassMetadataInfo
60 60
      */
61 61
     public function getClassMetadata()
62 62
     {
@@ -66,7 +66,7 @@ public function getClassMetadata()
66 66
     /**
67 67
      * Retrieve associated EntityManager.
68 68
      * 
69  
-     * @return Doctrine\ORM\EntityManager
  69
+     * @return \Doctrine\ORM\EntityManager
70 70
      */
71 71
     public function getEntityManager()
72 72
     {
6  lib/Doctrine/ORM/Event/OnClearEventArgs.php
@@ -31,7 +31,7 @@
31 31
 class OnClearEventArgs extends \Doctrine\Common\EventArgs
32 32
 {
33 33
     /**
34  
-     * @var Doctrine\ORM\EntityManager
  34
+     * @var \Doctrine\ORM\EntityManager
35 35
      */
36 36
     private $em;
37 37
 
@@ -43,7 +43,7 @@ class OnClearEventArgs extends \Doctrine\Common\EventArgs
43 43
     /**
44 44
      * Constructor.
45 45
      * 
46  
-     * @param Doctrine\ORM\EntityManager $em
  46
+     * @param \Doctrine\ORM\EntityManager $em
47 47
      * @param string $entityClass Optional entity class
48 48
      */
49 49
     public function __construct($em, $entityClass = null)
@@ -55,7 +55,7 @@ public function __construct($em, $entityClass = null)
55 55
     /**
56 56
      * Retrieve associated EntityManager.
57 57
      * 
58  
-     * @return Doctrine\ORM\EntityManager
  58
+     * @return \Doctrine\ORM\EntityManager
59 59
      */
60 60
     public function getEntityManager()
61 61
     {
4  lib/Doctrine/ORM/Event/OnFlushEventArgs.php
@@ -45,7 +45,7 @@ class OnFlushEventArgs extends \Doctrine\Common\EventArgs
45 45
     /**
46 46
      * Constructor.
47 47
      * 
48  
-     * @param Doctrine\ORM\EntityManager $em 
  48
+     * @param \Doctrine\ORM\EntityManager $em
49 49
      */
50 50
     public function __construct(EntityManager $em)
51 51
     {
@@ -55,7 +55,7 @@ public function __construct(EntityManager $em)
55 55
     /**
56 56
      * Retrieve associated EntityManager.
57 57
      * 
58  
-     * @return Doctrine\ORM\EntityManager
  58
+     * @return \Doctrine\ORM\EntityManager
59 59
      */
60 60
     public function getEntityManager()
61 61
     {
6  lib/Doctrine/ORM/Event/PostFlushEventArgs.php
@@ -35,14 +35,14 @@
35 35
 class PostFlushEventArgs extends EventArgs
36 36
 {
37 37
     /**
38  
-     * @var Doctrine\ORM\EntityManager
  38
+     * @var \Doctrine\ORM\EntityManager
39 39
      */
40 40
     private $em;
41 41
 
42 42
     /**
43 43
      * Constructor.
44 44
      * 
45  
-     * @param Doctrine\ORM\EntityManager $em
  45
+     * @param \Doctrine\ORM\EntityManager $em
46 46
      */
47 47
     public function __construct(EntityManager $em)
48 48
     {
@@ -52,7 +52,7 @@ public function __construct(EntityManager $em)
52 52
     /**
53 53
      * Retrieve associated EntityManager.
54 54
      * 
55  
-     * @return Doctrine\ORM\EntityManager
  55
+     * @return \Doctrine\ORM\EntityManager
56 56
      */
57 57
     public function getEntityManager()
58 58
     {
2  lib/Doctrine/ORM/Event/PreUpdateEventArgs.php
@@ -43,7 +43,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs
43 43
      * Constructor.
44 44
      * 
45 45
      * @param object $entity
46  
-     * @param Doctrine\ORM\EntityManager $em
  46
+     * @param \Doctrine\ORM\EntityManager $em
47 47
      * @param array $changeSet
48 48
      */
49 49
     public function __construct($entity, EntityManager $em, array &$changeSet)
2  lib/Doctrine/ORM/Id/AbstractIdGenerator.php
@@ -26,7 +26,7 @@
26 26
     /**
27 27
      * Generates an identifier for an entity.
28 28
      *
29  
-     * @param Doctrine\ORM\Entity $entity
  29
+     * @param \Doctrine\ORM\Entity $entity
30 30
      * @return mixed
31 31
      */
32 32
     abstract public function generate(EntityManager $em, $entity);
2  lib/Doctrine/ORM/Id/SequenceGenerator.php
@@ -37,7 +37,7 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
37 37
     /**
38 38
      * Initializes a new sequence generator.
39 39
      *
40  
-     * @param Doctrine\ORM\EntityManager $em The EntityManager to use.
  40
+     * @param \Doctrine\ORM\EntityManager $em The EntityManager to use.
41 41
      * @param string $sequenceName The name of the sequence.
42 42
      * @param integer $allocationSize The allocation size of the sequence.
43 43
      */
4  lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
@@ -60,7 +60,7 @@
60 60
     /**
61 61
      * Initializes a new instance of a class derived from <tt>AbstractHydrator</tt>.
62 62
      *
63  
-     * @param Doctrine\ORM\EntityManager $em The EntityManager to use.
  63
+     * @param \Doctrine\ORM\EntityManager $em The EntityManager to use.
64 64
      */
65 65
     public function __construct(EntityManager $em)
66 66
     {
@@ -344,7 +344,7 @@ protected function gatherScalarRowData(&$data, &$cache)
344 344
     /**
345 345
      * Register entity as managed in UnitOfWork.
346 346
      *
347  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $class
  347
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $class
348 348
      * @param object $entity
349 349
      * @param array $data
350 350
      *
2  lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
@@ -276,7 +276,7 @@ private function updateResultPointer(array &$coll, $index, $dqlAlias, $oneToOne)
276 276
      *
277 277
      * @param string $className
278 278
      *
279  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  279
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
280 280
      */
281 281
     private function getClassMetadata($className)
282 282
     {
4  lib/Doctrine/ORM/Internal/Hydration/IterableResult.php
@@ -29,7 +29,7 @@
29 29
 class IterableResult implements \Iterator
30 30
 {
31 31
     /**
32  
-     * @var Doctrine\ORM\Internal\Hydration\AbstractHydrator
  32
+     * @var \Doctrine\ORM\Internal\Hydration\AbstractHydrator
33 33
      */
34 34
     private $_hydrator;
35 35
 
@@ -49,7 +49,7 @@ class IterableResult implements \Iterator
49 49
     private $_current = null;
50 50
 
51 51
     /**
52  
-     * @param Doctrine\ORM\Internal\Hydration\AbstractHydrator $hydrator
  52
+     * @param \Doctrine\ORM\Internal\Hydration\AbstractHydrator $hydrator
53 53
      */
54 54
     public function __construct($hydrator)
55 55
     {
22  lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -85,7 +85,7 @@ public function setEntityManager(EntityManager $em)
85 85
     /**
86 86
      * Sets the cache driver used by the factory to cache ClassMetadata instances.
87 87
      *
88  
-     * @param Doctrine\Common\Cache\Cache $cacheDriver
  88
+     * @param \Doctrine\Common\Cache\Cache $cacheDriver
89 89
      */
90 90
     public function setCacheDriver($cacheDriver)
91 91
     {
@@ -95,7 +95,7 @@ public function setCacheDriver($cacheDriver)
95 95
     /**
96 96
      * Gets the cache driver used by the factory to cache ClassMetadata instances.
97 97
      *
98  
-     * @return Doctrine\Common\Cache\Cache
  98
+     * @return \Doctrine\Common\Cache\Cache
99 99
      */
100 100
     public function getCacheDriver()
101 101
     {
@@ -143,7 +143,7 @@ private function initialize()
143 143
      * Gets the class metadata descriptor for a class.
144 144
      *
145 145
      * @param string $className The name of the class.
146  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  146
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
147 147
      */
148 148
     public function getMetadataFor($className)
149 149
     {
@@ -377,7 +377,7 @@ protected function validateRuntimeMetadata($class, $parent)
377 377
      * Creates a new ClassMetadata instance for the given class name.
378 378
      *
379 379
      * @param string $className
380  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  380
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
381 381
      */
382 382
     protected function newClassMetadataInstance($className)
383 383
     {
@@ -387,8 +387,8 @@ protected function newClassMetadataInstance($className)
387 387
     /**
388 388
      * Adds inherited fields to the subclass mapping.
389 389
      *
390  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $subClass
391  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $parentClass
  390
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $subClass
  391
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass
392 392
      */
393 393
     private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $parentClass)
394 394
     {
@@ -409,8 +409,8 @@ private function addInheritedFields(ClassMetadata $subClass, ClassMetadata $pare
409 409
     /**
410 410
      * Adds inherited association mappings to the subclass mapping.
411 411
      *
412  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $subClass
413  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $parentClass
  412
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $subClass
  413
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass
414 414
      */
415 415
     private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $parentClass)
416 416
     {
@@ -437,8 +437,8 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
437 437
      * Adds inherited named queries to the subclass mapping.
438 438
      * 
439 439
      * @since 2.2
440  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $subClass
441  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $parentClass
  440
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $subClass
  441
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $parentClass
442 442
      */
443 443
     private function addInheritedNamedQueries(ClassMetadata $subClass, ClassMetadata $parentClass)
444 444
     {
@@ -456,7 +456,7 @@ private function addInheritedNamedQueries(ClassMetadata $subClass, ClassMetadata
456 456
      * Completes the ID generator mapping. If "auto" is specified we choose the generator
457 457
      * most appropriate for the targeted database platform.
458 458
      *
459  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $class
  459
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $class
460 460
      */
461 461
     private function completeIdGeneratorMapping(ClassMetadataInfo $class)
462 462
     {
4  lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1250,7 +1250,7 @@ public function isIdentifierNatural()
1250 1250
      * Gets the type of a field.
1251 1251
      *
1252 1252
      * @param string $fieldName
1253  
-     * @return Doctrine\DBAL\Types\Type
  1253
+     * @return \Doctrine\DBAL\Types\Type
1254 1254
      */
1255 1255
     public function getTypeOfField($fieldName)
1256 1256
     {
@@ -1261,7 +1261,7 @@ public function getTypeOfField($fieldName)
1261 1261
     /**
1262 1262
      * Gets the type of a column.
1263 1263
      *
1264  
-     * @return Doctrine\DBAL\Types\Type
  1264
+     * @return \Doctrine\DBAL\Types\Type
1265 1265
      */
1266 1266
     public function getTypeOfColumn($columnName)
1267 1267
     {
2  lib/Doctrine/ORM/Mapping/JoinColumns.php
@@ -25,6 +25,6 @@
25 25
  */
26 26
 final class JoinColumns implements Annotation
27 27
 {
28  
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
  28
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
29 29
     public $value;
30 30
 }
4  lib/Doctrine/ORM/Mapping/JoinTable.php
@@ -29,8 +29,8 @@
29 29
     public $name;
30 30
     /** @var string */
31 31
     public $schema;
32  
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
  32
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
33 33
     public $joinColumns = array();
34  
-    /** @var array<Doctrine\ORM\Mapping\JoinColumn> */
  34
+    /** @var array<\Doctrine\ORM\Mapping\JoinColumn> */
35 35
     public $inverseJoinColumns = array();
36 36
 }
2  lib/Doctrine/ORM/Mapping/NamedQueries.php
@@ -25,6 +25,6 @@
25 25
  */
26 26
 final class NamedQueries implements Annotation
27 27
 {
28  
-    /** @var array<Doctrine\ORM\Mapping\NamedQuery> */
  28
+    /** @var array<\Doctrine\ORM\Mapping\NamedQuery> */
29 29
     public $value;
30 30
 }
4  lib/Doctrine/ORM/Mapping/Table.php
@@ -29,8 +29,8 @@
29 29
     public $name;
30 30
     /** @var string */
31 31
     public $schema;
32  
-    /** @var array<Doctrine\ORM\Mapping\Index> */
  32
+    /** @var array<\Doctrine\ORM\Mapping\Index> */
33 33
     public $indexes;
34  
-    /** @var array<Doctrine\ORM\Mapping\UniqueConstraint> */
  34
+    /** @var array<\Doctrine\ORM\Mapping\UniqueConstraint> */
35 35
     public $uniqueConstraints;
36 36
 }
6  lib/Doctrine/ORM/PersistentCollection.php
@@ -67,7 +67,7 @@
67 67
     /**
68 68
      * The EntityManager that manages the persistence of the collection.
69 69
      *
70  
-     * @var Doctrine\ORM\EntityManager
  70
+     * @var \Doctrine\ORM\EntityManager
71 71
      */
72 72
     private $em;
73 73
 
@@ -284,7 +284,7 @@ function($a, $b) { return $a === $b ? 0 : 1; }
284 284
     /**
285 285
      * INTERNAL: Gets the association mapping of the collection.
286 286
      *
287  
-     * @return Doctrine\ORM\Mapping\AssociationMapping
  287
+     * @return \Doctrine\ORM\Mapping\AssociationMapping
288 288
      */
289 289
     public function getMapping()
290 290
     {
@@ -728,7 +728,7 @@ public function next()
728 728
     /**
729 729
      * Retrieves the wrapped Collection instance.
730 730
      *
731  
-     * @return Doctrine\Common\Collections\Collection
  731
+     * @return \Doctrine\Common\Collections\Collection
732 732
      */
733 733
     public function unwrap()
734 734
     {
6  lib/Doctrine/ORM/Persisters/AbstractCollectionPersister.php
@@ -36,19 +36,19 @@
36 36
     protected $_em;
37 37
 
38 38
     /**
39  
-     * @var Doctrine\DBAL\Connection
  39
+     * @var \Doctrine\DBAL\Connection
40 40
      */
41 41
     protected $_conn;
42 42
 
43 43
     /**
44  
-     * @var Doctrine\ORM\UnitOfWork
  44
+     * @var \Doctrine\ORM\UnitOfWork
45 45
      */
46 46
     protected $_uow;
47 47
 
48 48
     /**
49 49
      * Initializes a new instance of a class derived from AbstractCollectionPersister.
50 50
      *
51  
-     * @param Doctrine\ORM\EntityManager $em
  51
+     * @param \Doctrine\ORM\EntityManager $em
52 52
      */
53 53
     public function __construct(EntityManager $em)
54 54
     {
22  lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -79,28 +79,28 @@ class BasicEntityPersister
79 79
     /**
80 80
      * Metadata object that describes the mapping of the mapped entity class.
81 81
      *
82  
-     * @var Doctrine\ORM\Mapping\ClassMetadata
  82
+     * @var \Doctrine\ORM\Mapping\ClassMetadata
83 83
      */
84 84
     protected $_class;
85 85
 
86 86
     /**
87 87
      * The underlying DBAL Connection of the used EntityManager.
88 88
      *
89  
-     * @var Doctrine\DBAL\Connection $conn
  89
+     * @var \Doctrine\DBAL\Connection $conn
90 90
      */
91 91
     protected $_conn;
92 92
 
93 93
     /**
94 94
      * The database platform.
95 95
      *
96  
-     * @var Doctrine\DBAL\Platforms\AbstractPlatform
  96
+     * @var \Doctrine\DBAL\Platforms\AbstractPlatform
97 97
      */
98 98
     protected $_platform;
99 99
 
100 100
     /**
101 101
      * The EntityManager instance.
102 102
      *
103  
-     * @var Doctrine\ORM\EntityManager
  103
+     * @var \Doctrine\ORM\EntityManager
104 104
      */
105 105
     protected $_em;
106 106
 
@@ -172,8 +172,8 @@ class BasicEntityPersister
172 172
      * Initializes a new <tt>BasicEntityPersister</tt> that uses the given EntityManager
173 173
      * and persists instances of the class described by the given ClassMetadata descriptor.
174 174
      *
175  
-     * @param Doctrine\ORM\EntityManager $em
176  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $class
  175
+     * @param \Doctrine\ORM\EntityManager $em
  176
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $class
177 177
      */
178 178
     public function __construct(EntityManager $em, ClassMetadata $class)
179 179
     {
@@ -184,7 +184,7 @@ public function __construct(EntityManager $em, ClassMetadata $class)
184 184
     }
185 185
 
186 186
     /**
187  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  187
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
188 188
      */
189 189
     public function getClassMetadata()
190 190
     {
@@ -272,7 +272,7 @@ protected function assignDefaultVersionValue($entity, $id)
272 272
     /**
273 273
      * Fetch the current version value of a versioned entity.
274 274
      *
275  
-     * @param Doctrine\ORM\Mapping\ClassMetadata $versionedClass
  275
+     * @param \Doctrine\ORM\Mapping\ClassMetadata $versionedClass
276 276
      * @param mixed $id
277 277
      * @return mixed
278 278
      */
@@ -750,7 +750,7 @@ public function getManyToManyCollection(array $assoc, $sourceEntity, $offset = n
750 750
      * Load an array of entities from a given dbal statement.
751 751
      *
752 752
      * @param array $assoc
753  
-     * @param Doctrine\DBAL\Statement $stmt
  753
+     * @param \Doctrine\DBAL\Statement $stmt
754 754
      *
755 755
      * @return array
756 756
      */
@@ -774,7 +774,7 @@ private function loadArrayFromStatement($assoc, $stmt)
774 774
      * Hydrate a collection from a given dbal statement.
775 775
      *
776 776
      * @param array $assoc
777  
-     * @param Doctrine\DBAL\Statement $stmt
  777
+     * @param \Doctrine\DBAL\Statement $stmt
778 778
      * @param PersistentCollection $coll
779 779
      *
780 780
      * @return array
@@ -1368,7 +1368,7 @@ public function loadOneToManyCollection(array $assoc, $sourceEntity, PersistentC
1368 1368
      * @param object $sourceEntity
1369 1369
      * @param int|null $offset
1370 1370
      * @param int|null $limit
1371  
-     * @return Doctrine\DBAL\Statement
  1371
+     * @return \Doctrine\DBAL\Statement
1372 1372
      */
1373 1373
     private function getOneToManyStatement(array $assoc, $sourceEntity, $offset = null, $limit = null)
1374 1374
     {
2  lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
@@ -67,7 +67,7 @@ protected function _getDiscriminatorColumnTableName()
67 67
      * This function finds the ClassMetadata instance in an inheritance hierarchy
68 68
      * that is responsible for enabling versioning.
69 69
      *
70  
-     * @return Doctrine\ORM\Mapping\ClassMetadata
  70
+     * @return \Doctrine\ORM\Mapping\ClassMetadata
71 71
      */
72 72
     private function _getVersionedClassMetadata()
73 73
     {
2  lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
@@ -279,7 +279,7 @@ public function removeElement(PersistentCollection $coll, $element)
279 279
     }
280 280
     
281 281
     /**
282  
-     * @param Doctrine\ORM\PersistentCollection $coll
  282
+     * @param \Doctrine\ORM\PersistentCollection $coll
283 283
      * @param object $element
284 284
      * @return array
285 285
      */
22  lib/Doctrine/ORM/Query.php
@@ -81,7 +81,7 @@
81 81
     const HINT_INCLUDE_META_COLUMNS = 'doctrine.includeMetaColumns';
82 82
 
83 83
     /**
84  
-     * An array of class names that implement Doctrine\ORM\Query\TreeWalker and
  84
+     * An array of class names that implement \Doctrine\ORM\Query\TreeWalker and
85 85
      * are iterated and executed after the DQL has been parsed into an AST.
86 86
      *
87 87
      * @var string
@@ -89,7 +89,7 @@
89 89
     const HINT_CUSTOM_TREE_WALKERS = 'doctrine.customTreeWalkers';
90 90
 
91 91
     /**
92  
-     * A string with a class name that implements Doctrine\ORM\Query\TreeWalker
  92
+     * A string with a class name that implements \Doctrine\ORM\Query\TreeWalker
93 93
      * and is used for generating the target SQL from any DQL AST tree.
94 94
      *
95 95
      * @var string
@@ -119,7 +119,7 @@
119 119
     private $_dql = null;
120 120
 
121 121
     /**
122  
-     * @var Doctrine\ORM\Query\ParserResult  The parser result that holds DQL => SQL information.
  122
+     * @var \Doctrine\ORM\Query\ParserResult  The parser result that holds DQL => SQL information.
123 123
      */
124 124
     private $_parserResult;
125 125
 
@@ -158,7 +158,7 @@
158 158
     /**
159 159
      * Initializes a new Query instance.
160 160
      *
161  
-     * @param Doctrine\ORM\EntityManager $entityManager
  161
+     * @param \Doctrine\ORM\EntityManager $entityManager
162 162
      */
163 163
     /*public function __construct(EntityManager $entityManager)
164 164
     {
@@ -179,9 +179,9 @@ public function getSQL()
179 179
     /**
180 180
      * Returns the corresponding AST for this DQL query.
181 181
      *
182  
-     * @return Doctrine\ORM\Query\AST\SelectStatement |
183  
-     *         Doctrine\ORM\Query\AST\UpdateStatement |
184  
-     *         Doctrine\ORM\Query\AST\DeleteStatement
  182
+     * @return \Doctrine\ORM\Query\AST\SelectStatement |
  183
+     *         \Doctrine\ORM\Query\AST\UpdateStatement |
  184
+     *         \Doctrine\ORM\Query\AST\DeleteStatement
185 185
      */
186 186
     public function getAST()
187 187
     {
@@ -194,7 +194,7 @@ public function getAST()
194 194
      *
195 195
      * Note: Populates $this->_parserResult as a side-effect.
196 196
      *
197  
-     * @return Doctrine\ORM\Query\ParserResult
  197
+     * @return \Doctrine\ORM\Query\ParserResult
198 198
      */
199 199
     private function _parse()
200 200
     {
@@ -441,7 +441,7 @@ public function free()
441 441
      * Sets a DQL query string.
442 442
      *
443 443
      * @param string $dqlQuery DQL Query
444  
-     * @return Doctrine\ORM\AbstractQuery
  444
+     * @return \Doctrine\ORM\AbstractQuery
445 445
      */
446 446
     public function setDQL($dqlQuery)
447 447
     {
@@ -577,7 +577,7 @@ public function setHydrationMode($hydrationMode)
577 577
     /**
578 578
      * Set the lock mode for this Query.
579 579
      *
580  
-     * @see Doctrine\DBAL\LockMode
  580
+     * @see \Doctrine\DBAL\LockMode
581 581
      * @param  int $lockMode
582 582
      * @return Query
583 583
      */
@@ -639,4 +639,4 @@ public function __clone()
639 639
         
640 640
         $this->_state = self::STATE_DIRTY;
641 641
     }
642  
-}
  642
+}
4  lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php
@@ -61,10 +61,10 @@ public function setQueryCacheProfile(QueryCacheProfile $qcp)
61 61
     /**
62 62
      * Executes all sql statements.
63 63
      *
64  
-     * @param Doctrine\DBAL\Connection $conn The database connection that is used to execute the queries.
  64
+     * @param \Doctrine\DBAL\Connection $conn The database connection that is used to execute the queries.
65 65
      * @param array $params  The parameters.
66 66
      * @param array $types The parameter types.
67  
-     * @return Doctrine\DBAL\Driver\Statement
  67
+     * @return \Doctrine\DBAL\Driver\Statement
68 68
      */
69 69
     abstract public function execute(Connection $conn, array $params, array $types);
70 70
 }
6  lib/Doctrine/ORM/Query/Expr.php
@@ -42,9 +42,9 @@ class Expr
42 42
      *     // (u.type = ?1) AND (u.role = ?2)
43 43
      *     $expr->andX($expr->eq('u.type', ':1'), $expr->eq('u.role', ':2'));
44 44
      *
45  
-     * @param Doctrine\ORM\Query\Expr\Comparison | 
46  
-     *          Doctrine\ORM\Query\Expr\Func |
47  
-     *          Doctrine\ORM\Query\Expr\Orx 
  45
+     * @param \Doctrine\ORM\Query\Expr\Comparison |
  46
+     *          \Doctrine\ORM\Query\Expr\Func |
  47
+     *          \Doctrine\ORM\Query\Expr\Orx
48 48
     *               $x Optional clause. Defaults = null, but requires at least one defined when converting to string.
49 49
      * @return Expr\Andx
50 50
      */
4  lib/Doctrine/ORM/Query/ParameterTypeInferer.php
@@ -37,8 +37,8 @@ class ParameterTypeInferer
37 37
 {
38 38
     /**
39 39
      * Infer type of a given value, returning a compatible constant:
40  
-     * - Type (Doctrine\DBAL\Types\Type::*) 
41  
-     * - Connection (Doctrine\DBAL\Connection::PARAM_*)
  40
+     * - Type (\Doctrine\DBAL\Types\Type::*)
  41
+     * - Connection (\Doctrine\DBAL\Connection::PARAM_*)
42 42
      * 
43 43
      * @param mixed $value Parameter value
44 44
      * 
28  lib/Doctrine/ORM/Query/Parser.php
@@ -76,14 +76,14 @@ class Parser
76 76
     /**
77 77
      * The lexer.
78 78
      *
79  
-     * @var Doctrine\