@@ -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 |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Doctrine\Tests\ORM\Functional; |
4 | 4 | |
5 | -use Doctrine\Tests\Models\CMS\CmsUser, |
|
6 | - Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
5 | +use Doctrine\Tests\Models\CMS\CmsUser; |
|
6 | +use Doctrine\Tests\Models\CMS\CmsPhonenumber; |
|
7 | 7 | use Doctrine\Tests\OrmFunctionalTestCase; |
8 | 8 | |
9 | 9 | /** |
@@ -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 |