@@ -116,6 +116,10 @@ discard block |
||
116 | 116 | */ |
117 | 117 | private $driverRides; |
118 | 118 | |
119 | + /** |
|
120 | + * @param integer $id |
|
121 | + * @param string $name |
|
122 | + */ |
|
119 | 123 | function __construct($id, $name) |
120 | 124 | { |
121 | 125 | $this->driverRides = new ArrayCollection(); |
@@ -204,6 +208,10 @@ discard block |
||
204 | 208 | */ |
205 | 209 | private $carRides; |
206 | 210 | |
211 | + /** |
|
212 | + * @param string $brand |
|
213 | + * @param string $model |
|
214 | + */ |
|
207 | 215 | function __construct($brand, $model) |
208 | 216 | { |
209 | 217 | $this->carRides = new 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) |
@@ -2,13 +2,12 @@ |
||
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\CompanyAuction, |
|
10 | - Doctrine\Tests\Models\Company\CompanyRaffle; |
|
11 | - |
|
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\CompanyAuction; |
|
10 | +use Doctrine\Tests\Models\Company\CompanyRaffle; |
|
12 | 11 | use Doctrine\Common\Collections\Criteria; |
13 | 12 | use Doctrine\Tests\OrmFunctionalTestCase; |
14 | 13 |
@@ -3,11 +3,10 @@ |
||
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | - |
|
7 | 6 | use Doctrine\ORM\UnexpectedResultException; |
8 | -use Doctrine\Tests\Models\CMS\CmsUser, |
|
9 | - Doctrine\Tests\Models\CMS\CmsArticle, |
|
10 | - Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
7 | +use Doctrine\Tests\Models\CMS\CmsUser; |
|
8 | +use Doctrine\Tests\Models\CMS\CmsArticle; |
|
9 | +use Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
11 | 10 | use Doctrine\ORM\Mapping\ClassMetadata; |
12 | 11 | use Doctrine\ORM\Query; |
13 | 12 | use Doctrine\ORM\Query\Parameter; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\ORM\Query; |
|
6 | 5 | use Doctrine\Tests\Models\CMS\CmsUser; |
7 | 6 | use Doctrine\Tests\OrmFunctionalTestCase; |
8 | 7 |
@@ -45,6 +45,9 @@ |
||
45 | 45 | */ |
46 | 46 | class ConvertDoctrine1SchemaTest extends OrmTestCase |
47 | 47 | { |
48 | + /** |
|
49 | + * @param YamlDriver $metadataDriver |
|
50 | + */ |
|
48 | 51 | protected function _createEntityManager($metadataDriver) |
49 | 52 | { |
50 | 53 | $driverMock = new DriverMock(); |
@@ -25,7 +25,6 @@ |
||
25 | 25 | use Doctrine\ORM\Tools\Export\ClassMetadataExporter; |
26 | 26 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
27 | 27 | use Doctrine\ORM\Tools\EntityGenerator; |
28 | -use Doctrine\Tests\Mocks\MetadataDriverMock; |
|
29 | 28 | use Doctrine\Tests\Mocks\EntityManagerMock; |
30 | 29 | use Doctrine\Tests\Mocks\ConnectionMock; |
31 | 30 | use Doctrine\Tests\Mocks\DriverMock; |
@@ -217,12 +217,12 @@ |
||
217 | 217 | |
218 | 218 | if ( ! $this->fileLockRegionDirectory) { |
219 | 219 | throw new \LogicException( |
220 | - 'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' . |
|
220 | + 'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '. |
|
221 | 221 | 'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you what to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). ' |
222 | 222 | ); |
223 | 223 | } |
224 | 224 | |
225 | - $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region']; |
|
225 | + $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region']; |
|
226 | 226 | $region = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region'])); |
227 | 227 | } |
228 | 228 |
@@ -222,6 +222,9 @@ discard block |
||
222 | 222 | $this->assertEquals(array(), $metadata); |
223 | 223 | } |
224 | 224 | |
225 | + /** |
|
226 | + * @param \PHPUnit_Framework_MockObject_MockObject $conn |
|
227 | + */ |
|
225 | 228 | protected function _createEntityManager($metadataDriver, $conn = null) |
226 | 229 | { |
227 | 230 | $driverMock = new DriverMock(); |
@@ -250,7 +253,6 @@ discard block |
||
250 | 253 | } |
251 | 254 | |
252 | 255 | /** |
253 | - * @param string $class |
|
254 | 256 | * @return ClassMetadata |
255 | 257 | */ |
256 | 258 | protected function _createValidClassMetadata() |
@@ -460,6 +462,10 @@ discard block |
||
460 | 462 | return $this->mockMetadata[$className]; |
461 | 463 | } |
462 | 464 | |
465 | + /** |
|
466 | + * @param string $className |
|
467 | + * @param ClassMetadata $metadata |
|
468 | + */ |
|
463 | 469 | public function setMetadataForClass($className, $metadata) |
464 | 470 | { |
465 | 471 | $this->mockMetadata[$className] = $metadata; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
130 | - * @param field_type $fooTitle |
|
130 | + * @param string $fooTitle |
|
131 | 131 | */ |
132 | 132 | public function setFooTitle($fooTitle) |
133 | 133 | { |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
208 | - * @param field_type $barTitle |
|
208 | + * @param string $barTitle |
|
209 | 209 | */ |
210 | 210 | public function setBarTitle($barTitle) |
211 | 211 | { |