@@ -21,7 +21,6 @@ |
||
21 | 21 | |
22 | 22 | use Doctrine\Common\Collections\ArrayCollection; |
23 | 23 | use Doctrine\Common\Collections\Criteria; |
24 | - |
|
25 | 24 | use Doctrine\ORM\Query\Expr; |
26 | 25 | use Doctrine\ORM\Query\QueryExpressionVisitor; |
27 | 26 |
@@ -94,6 +94,7 @@ |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
97 | + * @param State $owner |
|
97 | 98 | * @return \Doctrine\ORM\PersistentCollection |
98 | 99 | */ |
99 | 100 | protected function createCollection($owner, $assoc = null, $class = null, $elements = null) |
@@ -3,11 +3,9 @@ |
||
3 | 3 | namespace Doctrine\Tests\ORM\Cache\Persister\Collection; |
4 | 4 | |
5 | 5 | use Doctrine\Tests\OrmTestCase; |
6 | - |
|
7 | 6 | use Doctrine\ORM\Cache\Region; |
8 | 7 | use Doctrine\ORM\EntityManager; |
9 | 8 | use Doctrine\ORM\Persisters\Collection\CollectionPersister; |
10 | - |
|
11 | 9 | use Doctrine\Tests\Models\Cache\State; |
12 | 10 | use Doctrine\Common\Collections\ArrayCollection; |
13 | 11 |
@@ -114,7 +114,7 @@ |
||
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
117 | - * @return \Doctrine\ORM\Cache\Persister\AbstractEntityPersister |
|
117 | + * @return \Doctrine\ORM\Cache\Persister\Entity\AbstractEntityPersister |
|
118 | 118 | */ |
119 | 119 | protected function createPersisterDefault() |
120 | 120 | { |
@@ -3,12 +3,10 @@ |
||
3 | 3 | namespace Doctrine\Tests\ORM\Cache\Persister\Entity; |
4 | 4 | |
5 | 5 | use Doctrine\Tests\OrmTestCase; |
6 | - |
|
7 | 6 | use Doctrine\ORM\Cache\Region; |
8 | 7 | use Doctrine\ORM\EntityManager; |
9 | 8 | use Doctrine\ORM\Mapping\ClassMetadata; |
10 | 9 | use Doctrine\ORM\Persisters\Entity\EntityPersister; |
11 | - |
|
12 | 10 | use Doctrine\Tests\Models\Cache\Country; |
13 | 11 | use Doctrine\Common\Collections\Criteria; |
14 | 12 | use Doctrine\Common\Collections\ArrayCollection; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | |
183 | 183 | /** |
184 | 184 | * |
185 | - * @param kateglo\application\models\Type $type |
|
185 | + * @param Type $type |
|
186 | 186 | * @return void |
187 | 187 | */ |
188 | 188 | public function addType(Type $type){ |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | |
195 | 195 | /** |
196 | 196 | * |
197 | - * @param kateglo\application\models\Type $type |
|
197 | + * @param Type $type |
|
198 | 198 | * @return void |
199 | 199 | */ |
200 | 200 | public function removeType(Type $type) |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | |
305 | 305 | /** |
306 | 306 | * |
307 | - * @param kateglo\application\models\Lemma $lemma |
|
307 | + * @param Lemma $lemma |
|
308 | 308 | * @return void |
309 | 309 | */ |
310 | 310 | public function addLemma(Lemma $lemma) |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | |
318 | 318 | /** |
319 | 319 | * |
320 | - * @param kateglo\application\models\Lemma $lemma |
|
320 | + * @param Lemma $lemma |
|
321 | 321 | * @return void |
322 | 322 | */ |
323 | 323 | public function removeLEmma(Lemma $lemma) |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | |
427 | 427 | /** |
428 | 428 | * |
429 | - * @return ArrayCollection |
|
429 | + * @return \Doctrine\Common\Collections\ArrayCollection |
|
430 | 430 | */ |
431 | 431 | public function getDefinitions(){ |
432 | 432 | return $this->definitions; |
@@ -2,8 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\ORM\Query; |
|
6 | - |
|
7 | 5 | /** |
8 | 6 | * Functional tests for the Single Table Inheritance mapping strategy. |
9 | 7 | * |
@@ -2,12 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\ORM\Tools\SchemaTool; |
|
6 | 5 | use Doctrine\ORM\Query; |
7 | 6 | use Doctrine\Tests\Models\CMS\CmsUser; |
8 | 7 | use Doctrine\Tests\Models\CMS\CmsPhonenumber; |
9 | 8 | use Doctrine\Tests\Models\CMS\CmsAddress; |
10 | -use Doctrine\Tests\Models\CMS\CmsGroup; |
|
11 | 9 | use Doctrine\Tests\Models\CMS\CmsArticle; |
12 | 10 | use Doctrine\Tests\Models\CMS\CmsComment; |
13 | 11 |
@@ -2,15 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\Tests\Models\Company\CompanyPerson, |
|
6 | - Doctrine\Tests\Models\Company\CompanyEmployee, |
|
7 | - Doctrine\Tests\Models\Company\CompanyManager, |
|
8 | - Doctrine\Tests\Models\Company\CompanyOrganization, |
|
9 | - Doctrine\Tests\Models\Company\CompanyEvent, |
|
10 | - Doctrine\Tests\Models\Company\CompanyAuction, |
|
11 | - Doctrine\Tests\Models\Company\CompanyRaffle, |
|
12 | - Doctrine\Tests\Models\Company\CompanyCar; |
|
13 | - |
|
5 | +use Doctrine\Tests\Models\Company\CompanyPerson; |
|
6 | +use Doctrine\Tests\Models\Company\CompanyEmployee; |
|
7 | +use Doctrine\Tests\Models\Company\CompanyManager; |
|
8 | +use Doctrine\Tests\Models\Company\CompanyOrganization; |
|
9 | +use Doctrine\Tests\Models\Company\CompanyEvent; |
|
10 | +use Doctrine\Tests\Models\Company\CompanyAuction; |
|
11 | +use Doctrine\Tests\Models\Company\CompanyRaffle; |
|
14 | 12 | use Doctrine\Common\Collections\Criteria; |
15 | 13 | |
16 | 14 | /** |
@@ -27,7 +27,7 @@ |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
30 | - * @param string $className |
|
30 | + * @param string $classNames |
|
31 | 31 | * @return ClassMetadata |
32 | 32 | */ |
33 | 33 | protected function extractClassMetadata(array $classNames) |
@@ -133,6 +133,12 @@ discard block |
||
133 | 133 | return array($user1, $user2, $user3); |
134 | 134 | } |
135 | 135 | |
136 | + /** |
|
137 | + * @param string $name |
|
138 | + * @param string $username |
|
139 | + * @param string $status |
|
140 | + * @param CmsAddress $address |
|
141 | + */ |
|
136 | 142 | public function buildUser($name, $username, $status, $address) |
137 | 143 | { |
138 | 144 | $user = new CmsUser(); |
@@ -147,6 +153,12 @@ discard block |
||
147 | 153 | return $user; |
148 | 154 | } |
149 | 155 | |
156 | + /** |
|
157 | + * @param string $country |
|
158 | + * @param string $city |
|
159 | + * @param string $street |
|
160 | + * @param string $zip |
|
161 | + */ |
|
150 | 162 | public function buildAddress($country, $city, $street, $zip) |
151 | 163 | { |
152 | 164 | $address = new CmsAddress(); |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Doctrine\Tests\Models\CMS\CmsUser; |
6 | 6 | use Doctrine\Tests\Models\CMS\CmsEmail; |
7 | 7 | use Doctrine\Tests\Models\CMS\CmsAddress; |
8 | -use Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
9 | 8 | use Doctrine\Common\Collections\Criteria; |
10 | 9 | use Doctrine\Common\Collections\ArrayCollection; |
11 | 10 |
@@ -2,10 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\Tests\Models\CMS\CmsUser, |
|
6 | - Doctrine\Tests\Models\CMS\CmsAddress, |
|
7 | - Doctrine\Tests\Models\CMS\CmsPhonenumber, |
|
8 | - Doctrine\ORM\Query; |
|
5 | +use Doctrine\Tests\Models\CMS\CmsUser; |
|
6 | +use Doctrine\Tests\Models\CMS\CmsAddress; |
|
7 | +use Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
8 | +use Doctrine\ORM\Query; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * IdentityMapTest |