@@ -2,9 +2,9 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
| 4 | 4 | |
| 5 | -use Doctrine\Tests\Models\CMS\CmsUser, |
|
| 6 | - Doctrine\Tests\Models\CMS\CmsEmail, |
|
| 7 | - Doctrine\Tests\Models\CMS\CmsAddress; |
|
| 5 | +use Doctrine\Tests\Models\CMS\CmsUser; |
|
| 6 | +use Doctrine\Tests\Models\CMS\CmsEmail; |
|
| 7 | +use Doctrine\Tests\Models\CMS\CmsAddress; |
|
| 8 | 8 | use Doctrine\Tests\OrmFunctionalTestCase; |
| 9 | 9 | |
| 10 | 10 | /** |
@@ -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,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Doctrine\Tests\ORM\Mapping; |
| 4 | 4 | |
| 5 | -use Doctrine\ORM\Mapping\ClassMetadata, |
|
| 6 | - Doctrine\ORM\Mapping\Driver\YamlDriver; |
|
| 5 | +use Doctrine\ORM\Mapping\ClassMetadata; |
|
| 6 | +use Doctrine\ORM\Mapping\Driver\YamlDriver; |
|
| 7 | 7 | use Doctrine\ORM\Mapping\ClassMetadataFactory; |
| 8 | 8 | |
| 9 | 9 | class YamlMappingDriverTest extends AbstractMappingDriverTest |
@@ -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 | { |
@@ -301,14 +301,14 @@ |
||
| 301 | 301 | */ |
| 302 | 302 | private function resolveMagicCall($method, $by, array $arguments) |
| 303 | 303 | { |
| 304 | - if (! $arguments) { |
|
| 305 | - throw ORMException::findByRequiresParameter($method . $by); |
|
| 304 | + if ( ! $arguments) { |
|
| 305 | + throw ORMException::findByRequiresParameter($method.$by); |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | $fieldName = lcfirst(Inflector::classify($by)); |
| 309 | 309 | |
| 310 | - if (! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) { |
|
| 311 | - throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method . $by); |
|
| 310 | + if ( ! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) { |
|
| 311 | + throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method.$by); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | return $this->$method([$fieldName => $arguments[0]], ...array_slice($arguments, 1)); |