RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Remove full qualified class names in tests

Browse Source
This commit is contained in:
Mikhail Shamin 2016-05-11 02:41:26 +07:00
parent bf322b903d
commit b173763bbb
95 changed files with 417 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Doctrine/Tests/EventListener/CacheMetadataListener.php
View File

@ -40,7 +40,7 @@ class CacheMetadataListener
*
* @return bool
*/
private function isVisited(ClassMetaData $metadata)
private function isVisited(ClassMetadata $metadata)
{
return isset($this->enabledItems[$metadata->getName()]);
}
@ -48,7 +48,7 @@ class CacheMetadataListener
/**
* @param ClassMetadata $metadata
*/
private function recordVisit(ClassMetaData $metadata)
private function recordVisit(ClassMetadata $metadata)
{
$this->enabledItems[$metadata->getName()] = true;
}

2
tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php
View File

@ -20,7 +20,7 @@ class DDC2504RootClass
public $id;
/**
* @var Doctrine\Tests\Models\DDC\DDC2504OtherClass
* @var \Doctrine\Tests\Models\DDC2504\DDC2504OtherClass
*
* @ManyToOne(targetEntity="DDC2504OtherClass", inversedBy="childClasses")
*/

2
tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php
View File

@ -10,7 +10,7 @@ class DDC3293User
protected $id;
/**
* @var Doctrine\Tests\Models\DDC3293\DDC3293Address
* @var \Doctrine\Tests\Models\DDC3293\DDC3293Address
*/
protected $address;
}

2
tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php
View File

@ -10,7 +10,7 @@ class DDC3293UserPrefixed
protected $id;
/**
* @var Doctrine\Tests\Models\DDC3293\DDC3293Address
* @var \Doctrine\Tests\Models\DDC3293\DDC3293Address
*/
protected $address;
}

3
tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
View File

@ -3,11 +3,12 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\Collection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Base class for testing a many-to-many association mapping (without inheritance).
*/
class AbstractManyToManyAssociationTestCase extends \Doctrine\Tests\OrmFunctionalTestCase
class AbstractManyToManyAssociationTestCase extends OrmFunctionalTestCase
{
protected $_firstField;
protected $_secondField;

12
tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
View File

@ -2,14 +2,16 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Query;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional tests for the Single Table Inheritance mapping strategy.
*
* @author robo
*/
class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class AdvancedAssociationTest extends OrmFunctionalTestCase
{
protected function setUp() {
parent::setUp();
@ -151,7 +153,7 @@ class Lemma {
private $types;
public function __construct() {
$this->types = new \Doctrine\Common\Collections\ArrayCollection();
$this->types = new ArrayCollection();
}
@ -257,7 +259,7 @@ class Type {
private $lemmas;
public function __construct(){
$this->lemmas = new \Doctrine\Common\Collections\ArrayCollection();
$this->lemmas = new ArrayCollection();
}
/**
@ -372,7 +374,7 @@ class Phrase {
private $definitions;
public function __construct() {
$this->definitions = new \Doctrine\Common\Collections\ArrayCollection;
$this->definitions = new ArrayCollection;
}
/**
@ -464,7 +466,7 @@ class PhraseType {
private $phrases;
public function __construct() {
$this->phrases = new \Doctrine\Common\Collections\ArrayCollection;
$this->phrases = new ArrayCollection;
}
/**

3
tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php
View File

@ -5,13 +5,14 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Company\CompanyEmployee,
Doctrine\Tests\Models\Company\CompanyManager,
Doctrine\Tests\Models\Company\CompanyCar;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional Query tests.
*
* @author Benjamin <kontakt@beberlei.de>
*/
class AdvancedDqlQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
class AdvancedDqlQueryTest extends OrmFunctionalTestCase
{
protected function setUp()
{

43
tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
View File

@ -2,14 +2,19 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Logging\DebugStack;
use Doctrine\ORM\EntityNotFoundException;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query;
use Doctrine\ORM\UnitOfWork;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsComment;
use Doctrine\Tests\OrmFunctionalTestCase;
class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
class BasicFunctionalTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -65,9 +70,9 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($user));
$this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($ph));
$this->assertFalse($this->_em->getUnitOfWork()->isScheduledForDelete($ph2));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph2));
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user));
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph));
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($ph2));
}
public function testOneToManyAssociationModification()
@ -146,15 +151,15 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$user->username = 'gblanco';
$user->status = 'developer';
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->_em->persist($user);
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_MANAGED");
$this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_MANAGED");
$this->_em->remove($user);
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->_em->persist($user);
$this->_em->flush();
@ -162,10 +167,10 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->remove($user);
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_REMOVED");
$this->assertEquals(UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_REMOVED");
$this->_em->flush();
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->assertEquals(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user), "State should be UnitOfWork::STATE_NEW");
$this->assertNull($this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $id));
}
@ -565,7 +570,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->persist($user);
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->text = "Lorem ipsum dolor sunt.";
$article->topic = "A Test Article!";
$article->setAuthor($user);
@ -608,7 +613,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$address->user = $user;
$user->address = $address;
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->text = "Lorem ipsum dolor sunt.";
$article->topic = "A Test Article!";
$article->setAuthor($user);
@ -628,7 +633,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address);
$oldLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger();
$debugStack = new \Doctrine\DBAL\Logging\DebugStack;
$debugStack = new DebugStack();
$this->_em->getConnection()->getConfiguration()->setSQLLogger($debugStack);
$this->_em->flush();
@ -938,7 +943,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
try {
$this->_em->merge($user);
$this->fail();
} catch (\Doctrine\ORM\EntityNotFoundException $enfe) {}
} catch (EntityNotFoundException $enfe) {}
}
/**
@ -995,7 +1000,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$dql = "SELECT a FROM Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.id = ?1";
$article = $this->_em->createQuery($dql)
->setParameter(1, $article->id)
->setFetchMode('Doctrine\Tests\Models\CMS\CmsArticle', 'user', \Doctrine\ORM\Mapping\ClassMetadata::FETCH_EAGER)
->setFetchMode('Doctrine\Tests\Models\CMS\CmsArticle', 'user', ClassMetadata::FETCH_EAGER)
->getSingleResult();
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $article->user, "It IS a proxy, ...");
$this->assertTrue($article->user->__isInitialized__, "...but its initialized!");
@ -1041,14 +1046,14 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser');
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article2));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address));
$this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user));
$this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1));
$this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article2));
$this->assertEquals(UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address));
$this->_em->clear();
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address));
$this->assertEquals(UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address));
}
public function testFlushManyExplicitEntities()

3
tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php
View File

@ -3,11 +3,12 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group CascadeRemoveOrderTest
*/
class CascadeRemoveOrderTest extends \Doctrine\Tests\OrmFunctionalTestCase
class CascadeRemoveOrderTest extends OrmFunctionalTestCase
{
protected function setUp()
{

8
tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
View File

@ -10,15 +10,17 @@ use Doctrine\Tests\Models\Company\CompanyPerson,
Doctrine\Tests\Models\Company\CompanyRaffle;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional tests for the Class Table Inheritance mapping strategy.
*
* @author robo
*/
class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ClassTableInheritanceTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
$this->useModelSet('company');
parent::setUp();
//$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
@ -80,7 +82,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
$query->setParameter(1, 'NewName', 'string');
$query->setParameter(2, 'NewDepartment');
$query->setParameter(3, 100000);
$query->getSql();
$query->getSQL();
$numUpdated = $query->execute();
$this->assertEquals(1, $numUpdated);

21
tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
View File

@ -1,15 +1,18 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional tests for the Class Table Inheritance mapping strategy.
*
* @author robo
*/
class ClassTableInheritanceTest2 extends \Doctrine\Tests\OrmFunctionalTestCase
class ClassTableInheritanceTest2 extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(array(
@ -156,19 +159,23 @@ class CTIRelated2
private $ctiChildren;
public function __construct() {
$this->ctiChildren = new \Doctrine\Common\Collections\ArrayCollection;
public function __construct()
{
$this->ctiChildren = new ArrayCollection();
}
public function getId() {
public function getId()
{
return $this->id;
}
public function addCTIChild(CTIChild $child) {
public function addCTIChild(CTIChild $child)
{
$this->ctiChildren->add($child);
}
public function getCTIChildren() {
public function getCTIChildren()
{
return $this->ctiChildren;
}
}

7
tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php
View File

@ -4,18 +4,15 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Event\OnClearEventArgs;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* ClearEventTest
*
* @author Michael Ridgway <mcridgway@gmail.com>
*/
class ClearEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ClearEventTest extends OrmFunctionalTestCase
{
protected function setUp() {
parent::setUp();
}
public function testEventIsCalledOnClear()
{
$listener = new OnClearListener;

3
tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
View File

@ -6,8 +6,9 @@ use Doctrine\Tests\Models\Navigation\NavPointOfInterest;
use Doctrine\Tests\Models\Navigation\NavTour;
use Doctrine\Tests\Models\Navigation\NavPhotos;
use Doctrine\Tests\Models\Navigation\NavUser;
use Doctrine\Tests\OrmFunctionalTestCase;
class CompositePrimaryKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class CompositePrimaryKeyTest extends OrmFunctionalTestCase
{
public function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php
View File

@ -5,8 +5,9 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\GeoNames\Country;
use Doctrine\Tests\Models\GeoNames\Admin1;
use Doctrine\Tests\Models\GeoNames\Admin1AlternateName;
use Doctrine\Tests\OrmFunctionalTestCase;
class CompositePrimaryKeyWithAssociationsTest extends \Doctrine\Tests\OrmFunctionalTestCase
class CompositePrimaryKeyWithAssociationsTest extends OrmFunctionalTestCase
{
public function setUp()
{

19
tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTest.php
View File

@ -3,6 +3,7 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Platforms\SQLServerPlatform;
use Doctrine\DBAL\Schema\Table;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
@ -30,10 +31,10 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
$this->markTestSkipped('Platform does not support foreign keys.');
}
$user = new \Doctrine\DBAL\Schema\Table("ddc2059_user");
$user = new Table("ddc2059_user");
$user->addColumn('id', 'integer');
$user->setPrimaryKey(array('id'));
$project = new \Doctrine\DBAL\Schema\Table("ddc2059_project");
$project = new Table("ddc2059_project");
$project->addColumn('id', 'integer');
$project->addColumn('user_id', 'integer');
$project->addColumn('user', 'string');
@ -52,7 +53,7 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
$this->markTestSkipped('Platform does not support foreign keys.');
}
$table = new \Doctrine\DBAL\Schema\Table("dbdriver_foo");
$table = new Table("dbdriver_foo");
$table->addColumn('id', 'integer');
$table->setPrimaryKey(array('id'));
$table->addColumn('bar', 'string', array('notnull' => false, 'length' => 200));
@ -83,13 +84,13 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
$this->markTestSkipped('Platform does not support foreign keys.');
}
$tableB = new \Doctrine\DBAL\Schema\Table("dbdriver_bar");
$tableB = new Table("dbdriver_bar");
$tableB->addColumn('id', 'integer');
$tableB->setPrimaryKey(array('id'));
$this->_sm->dropAndCreateTable($tableB);
$tableA = new \Doctrine\DBAL\Schema\Table("dbdriver_baz");
$tableA = new Table("dbdriver_baz");
$tableA->addColumn('id', 'integer');
$tableA->setPrimaryKey(array('id'));
$tableA->addColumn('bar_id', 'integer');
@ -133,15 +134,15 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
public function testIgnoreManyToManyTableWithoutFurtherForeignKeyDetails()
{
$tableB = new \Doctrine\DBAL\Schema\Table("dbdriver_bar");
$tableB = new Table("dbdriver_bar");
$tableB->addColumn('id', 'integer');
$tableB->setPrimaryKey(array('id'));
$tableA = new \Doctrine\DBAL\Schema\Table("dbdriver_baz");
$tableA = new Table("dbdriver_baz");
$tableA->addColumn('id', 'integer');
$tableA->setPrimaryKey(array('id'));
$tableMany = new \Doctrine\DBAL\Schema\Table("dbdriver_bar_baz");
$tableMany = new Table("dbdriver_bar_baz");
$tableMany->addColumn('bar_id', 'integer');
$tableMany->addColumn('baz_id', 'integer');
$tableMany->addForeignKeyConstraint('dbdriver_bar', array('bar_id'), array('id'));
@ -157,7 +158,7 @@ class DatabaseDriverTest extends DatabaseDriverTestCase
$this->markTestSkipped('Platform does not support foreign keys.');
}
$table = new \Doctrine\DBAL\Schema\Table("dbdriver_foo");
$table = new Table("dbdriver_foo");
$table->addColumn('id', 'integer', array('unsigned' => true));
$table->setPrimaryKey(array('id'));

5
tests/Doctrine/Tests/ORM/Functional/DatabaseDriverTestCase.php
View File

@ -2,6 +2,7 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Mapping\Driver\DatabaseDriver;
use Doctrine\Tests\OrmFunctionalTestCase;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
@ -13,7 +14,7 @@ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase
protected function convertToClassMetadata(array $entityTables, array $manyTables = array())
{
$sm = $this->_em->getConnection()->getSchemaManager();
$driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm);
$driver = new DatabaseDriver($sm);
$driver->setTables($entityTables, $manyTables);
$metadatas = array();
@ -36,7 +37,7 @@ abstract class DatabaseDriverTestCase extends OrmFunctionalTestCase
$metadatas = array();
$sm = $this->_em->getConnection()->getSchemaManager();
$driver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver($sm);
$driver = new DatabaseDriver($sm);
foreach ($driver->getAllClassNames() as $className) {
if (!in_array(strtolower($className), $classNames)) {

6
tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
View File

@ -1,15 +1,17 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests basic operations on entities with default values.
*
* @author robo
*/
class DefaultValuesTest extends \Doctrine\Tests\OrmFunctionalTestCase
class DefaultValuesTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(array(

6
tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php
View File

@ -6,15 +6,17 @@ use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Description of DetachedEntityTest
*
* @author robo
*/
class DetachedEntityTest extends \Doctrine\Tests\OrmFunctionalTestCase
class DetachedEntityTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
}

3
tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php
View File

@ -3,11 +3,12 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Company\CompanyFixContract;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1955
*/
class EntityListenersTest extends \Doctrine\Tests\OrmFunctionalTestCase
class EntityListenersTest extends OrmFunctionalTestCase
{
/**

3
tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php
View File

@ -23,11 +23,12 @@ use Doctrine\Tests\Models\Generic\DateTimeModel;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Tests\Models\Tweet\Tweet;
use Doctrine\Tests\Models\Tweet\User;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @author Josiah <josiah@jjs.id.au>
*/
class EntityRepositoryCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase
class EntityRepositoryCriteriaTest extends OrmFunctionalTestCase
{
protected function setUp()
{

18
tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
View File

@ -2,18 +2,22 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\LockMode;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsEmail;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @author robo
*/
class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
class EntityRepositoryTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
}
@ -290,7 +294,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->setExpectedException('Doctrine\ORM\TransactionRequiredException');
$this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
->find(1, \Doctrine\DBAL\LockMode::PESSIMISTIC_READ);
->find(1, LockMode::PESSIMISTIC_READ);
}
/**
@ -302,7 +306,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->setExpectedException('Doctrine\ORM\TransactionRequiredException');
$this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
->find(1, \Doctrine\DBAL\LockMode::PESSIMISTIC_WRITE);
->find(1, LockMode::PESSIMISTIC_WRITE);
}
/**
@ -314,7 +318,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->setExpectedException('Doctrine\ORM\OptimisticLockException');
$this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')
->find(1, \Doctrine\DBAL\LockMode::OPTIMISTIC);
->find(1, LockMode::OPTIMISTIC);
}
/**
@ -335,7 +339,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId);
$this->setExpectedException('Doctrine\ORM\OptimisticLockException');
$this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, \Doctrine\DBAL\LockMode::OPTIMISTIC);
$this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId, LockMode::OPTIMISTIC);
}
/**
@ -670,7 +674,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$query = array_pop($this->_sqlLoggerStack->queries);
$this->assertEquals(array(1,2,3), $query['params'][0]);
$this->assertEquals(\Doctrine\DBAL\Connection::PARAM_INT_ARRAY, $query['types'][0]);
$this->assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]);
}
/**

52
tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
View File

@ -3,6 +3,10 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsGroup;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\DDC2504\DDC2504ChildClass;
use Doctrine\Tests\Models\DDC2504\DDC2504OtherClass;
use Doctrine\Tests\Models\Tweet\Tweet;
@ -99,7 +103,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
{
$user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
$newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup();
$newGroup = new CmsGroup();
$newGroup->name = "Test4";
$user->addGroup($newGroup);
@ -277,7 +281,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
// Test One to Many existence with state new
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->topic = "Testnew";
$article->text = "blub";
@ -295,7 +299,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test One to Many existence with state managed
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->topic = "How to not fail anymore on tests";
$article->text = "That is simple! Just write more tests!";
@ -414,7 +418,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test Many to Many existence with state new
$group = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group = new CmsGroup();
$group->name = "A New group!";
$queryCount = $this->getCurrentQueryCount();
@ -434,7 +438,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test Many to Many existence with state managed
$group = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group = new CmsGroup();
$group->name = "My managed group";
$this->_em->persist($group);
@ -461,7 +465,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertEquals($queryCount+1, $this->getCurrentQueryCount(), "Checking for contains of managed entity should cause one query to be executed.");
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
$newUser = new \Doctrine\Tests\Models\CMS\CmsUser();
$newUser = new CmsUser();
$newUser->name = "A New group!";
$queryCount = $this->getCurrentQueryCount();
@ -488,7 +492,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertEquals($queryCount, $this->getCurrentQueryCount());
// Test One to Many removal with Entity state as new
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->topic = "Testnew";
$article->text = "blub";
@ -510,7 +514,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test One to Many removal with Entity state as managed
$article = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article = new CmsArticle();
$article->topic = "How to not fail anymore on tests";
$article->text = "That is simple! Just write more tests!";
@ -642,7 +646,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test Many to Many removal with Entity state as new
$group = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group = new CmsGroup();
$group->name = "A New group!";
$queryCount = $this->getCurrentQueryCount();
@ -664,7 +668,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
// Test Many to Many removal with Entity state as managed
$group = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group = new CmsGroup();
$group->name = "A New group!";
$this->_em->persist($group);
@ -693,7 +697,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->assertEquals($queryCount + 1, $this->getCurrentQueryCount(), "Removing a managed entity should cause one query to be executed.");
$this->assertFalse($user->groups->isInitialized(), "Post-Condition: Collection is not initialized.");
$newUser = new \Doctrine\Tests\Models\CMS\CmsUser();
$newUser = new CmsUser();
$newUser->name = "A New group!";
$queryCount = $this->getCurrentQueryCount();
@ -711,7 +715,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
{
$user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
$newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup();
$newGroup = new CmsGroup();
$newGroup->name = "Test4";
$user->addGroup($newGroup);
@ -735,7 +739,7 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
/* @var $user CmsUser */
$newGroup = new \Doctrine\Tests\Models\CMS\CmsGroup();
$newGroup = new CmsGroup();
$newGroup->name = "Test4";
$user->addGroup($newGroup);
@ -947,22 +951,22 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
private function loadFixture()
{
$user1 = new \Doctrine\Tests\Models\CMS\CmsUser();
$user1 = new CmsUser();
$user1->username = "beberlei";
$user1->name = "Benjamin";
$user1->status = "active";
$user2 = new \Doctrine\Tests\Models\CMS\CmsUser();
$user2 = new CmsUser();
$user2->username = "jwage";
$user2->name = "Jonathan";
$user2->status = "active";
$user3 = new \Doctrine\Tests\Models\CMS\CmsUser();
$user3 = new CmsUser();
$user3->username = "romanb";
$user3->name = "Roman";
$user3->status = "active";
$user4 = new \Doctrine\Tests\Models\CMS\CmsUser();
$user4 = new CmsUser();
$user4->username = "gblanco";
$user4->name = "Guilherme";
$user4->status = "active";
@ -972,13 +976,13 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->_em->persist($user3);
$this->_em->persist($user4);
$group1 = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group1 = new CmsGroup();
$group1->name = "Test1";
$group2 = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group2 = new CmsGroup();
$group2->name = "Test2";
$group3 = new \Doctrine\Tests\Models\CMS\CmsGroup();
$group3 = new CmsGroup();
$group3->name = "Test3";
$user1->addGroup($group1);
@ -993,12 +997,12 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->_em->persist($group2);
$this->_em->persist($group3);
$article1 = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article1 = new CmsArticle();
$article1->topic = "Test1";
$article1->text = "Test1";
$article1->setAuthor($user1);
$article2 = new \Doctrine\Tests\Models\CMS\CmsArticle();
$article2 = new CmsArticle();
$article2->topic = "Test2";
$article2->text = "Test2";
$article2->setAuthor($user1);
@ -1006,10 +1010,10 @@ class ExtraLazyCollectionTest extends OrmFunctionalTestCase
$this->_em->persist($article1);
$this->_em->persist($article2);
$phonenumber1 = new \Doctrine\Tests\Models\CMS\CmsPhonenumber();
$phonenumber1 = new CmsPhonenumber();
$phonenumber1->phonenumber = '12345';
$phonenumber2 = new \Doctrine\Tests\Models\CMS\CmsPhonenumber();
$phonenumber2 = new CmsPhonenumber();
$phonenumber2->phonenumber = '67890';
$this->_em->persist($phonenumber1);

6
tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
View File

@ -6,15 +6,17 @@ use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\ORM\Event\OnFlushEventArgs;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* FlushEventTest
*
* @author robo
*/
class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
class FlushEventTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
}

14
tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
View File

@ -2,10 +2,11 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsAddress,
Doctrine\Tests\Models\CMS\CmsPhonenumber,
Doctrine\ORM\Query;
use Doctrine\ORM\Query;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* IdentityMapTest
@ -15,9 +16,10 @@ use Doctrine\Tests\Models\CMS\CmsUser,
*
* @author Roman Borschel <roman@code-factory.org>
*/
class IdentityMapTest extends \Doctrine\Tests\OrmFunctionalTestCase
class IdentityMapTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
}

5
tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
View File

@ -5,14 +5,15 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\StockExchange\Stock;
use Doctrine\Tests\Models\StockExchange\Market;
use Doctrine\Tests\Models\StockExchange\Bond;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-250
*/
class IndexByAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class IndexByAssociationTest extends OrmFunctionalTestCase
{
/**
* @var Doctrine\Tests\Models\StockExchange\Market
* @var Market
*/
private $market;

28
tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
View File

@ -1,12 +1,18 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PreFlushEventArgs;
use Doctrine\ORM\Event\PreUpdateEventArgs;
use Doctrine\ORM\Query;
use Doctrine\Tests\OrmFunctionalTestCase;
class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase
class LifecycleCallbackTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(array(
@ -470,7 +476,7 @@ class LifecycleCallbackCascader
public function __construct()
{
$this->entities = new \Doctrine\Common\Collections\ArrayCollection();
$this->entities = new ArrayCollection();
}
/** @PostLoad */
@ -516,7 +522,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PostPersist
*/
public function postPersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function postPersistHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -524,7 +530,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PrePersist
*/
public function prePersistHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function prePersistHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -532,7 +538,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PostUpdate
*/
public function postUpdateHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function postUpdateHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -540,7 +546,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PreUpdate
*/
public function preUpdateHandler(\Doctrine\ORM\Event\PreUpdateEventArgs $event)
public function preUpdateHandler(PreUpdateEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -548,7 +554,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PostRemove
*/
public function postRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function postRemoveHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -556,7 +562,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PreRemove
*/
public function preRemoveHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function preRemoveHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -564,7 +570,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PreFlush
*/
public function preFlushHandler(\Doctrine\ORM\Event\PreFlushEventArgs $event)
public function preFlushHandler(PreFlushEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}
@ -572,7 +578,7 @@ class LifecycleCallbackEventArgEntity
/**
* @PostLoad
*/
public function postLoadHandler(\Doctrine\ORM\Event\LifecycleEventArgs $event)
public function postLoadHandler(LifecycleEventArgs $event)
{
$this->calls[__FUNCTION__] = $event;
}

13
tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
View File

@ -2,6 +2,11 @@
namespace Doctrine\Tests\ORM\Functional\Locking;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\DBAL\Logging\EchoSQLLogger;
use Doctrine\ORM\Configuration;
use Doctrine\ORM\EntityManager;
class LockAgentWorker
{
private $em;
@ -88,7 +93,7 @@ class LockAgentWorker
protected function createEntityManager($conn)
{
$config = new \Doctrine\ORM\Configuration();
$config = new Configuration();
$config->setProxyDir(__DIR__ . '/../../../Proxies');
$config->setProxyNamespace('MyProject\Proxies');
$config->setAutoGenerateProxyClasses(true);
@ -96,12 +101,12 @@ class LockAgentWorker
$annotDriver = $config->newDefaultAnnotationDriver(array(__DIR__ . '/../../../Models/'), true);
$config->setMetadataDriverImpl($annotDriver);
$cache = new \Doctrine\Common\Cache\ArrayCache();
$cache = new ArrayCache();
$config->setMetadataCacheImpl($cache);
$config->setQueryCacheImpl($cache);
$config->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger());
$config->setSQLLogger(new EchoSQLLogger());
$em = \Doctrine\ORM\EntityManager::create($conn, $config);
$em = EntityManager::create($conn, $config);
return $em;
}

26
tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
View File

@ -2,15 +2,19 @@
namespace Doctrine\Tests\ORM\Functional\Locking;
use Doctrine\Tests\Models\CMS\CmsArticle,
Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\DBAL\LockMode;
use Doctrine\DBAL\LockMode;
use Doctrine\ORM\Query;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group locking
*/
class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
protected function setUp() {
class LockTest extends OrmFunctionalTestCase
{
protected function setUp()
{
$this->useModelSet('cms');
parent::setUp();
$this->handles = array();
@ -111,8 +115,9 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
* @group DDC-178
* @group locking
*/
public function testLockPessimisticWrite() {
$writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSql();
public function testLockPessimisticWrite()
{
$writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL();
if (strlen($writeLockSql) == 0) {
$this->markTestSkipped('Database Driver has no Write Lock support.');
}
@ -141,8 +146,9 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
/**
* @group DDC-178
*/
public function testLockPessimisticRead() {
$readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSql();
public function testLockPessimisticRead()
{
$readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSQL();
if (strlen($readLockSql) == 0) {
$this->markTestSkipped('Database Driver has no Write Lock support.');
}
@ -177,7 +183,7 @@ class LockTest extends \Doctrine\Tests\OrmFunctionalTestCase {
$this->setExpectedException('Doctrine\ORM\OptimisticLockException', 'The optimistic lock on an entity failed.');
$sql = $this->_em->createQuery($dql)->setHint(
\Doctrine\ORM\Query::HINT_LOCK_MODE, \Doctrine\DBAL\LockMode::OPTIMISTIC
Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC
)->getSQL();
}
}

8
tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
View File

@ -3,10 +3,12 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\UnitOfWork;
use Doctrine\Tests\Models\CMS\CmsTag;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsGroup,
Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Basic many-to-many association tests.
@ -14,7 +16,7 @@ use Doctrine\Tests\Models\CMS\CmsUser,
*
* @author robo
*/
class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -53,8 +55,8 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa
$groups = $result[0]->getGroups();
$this->assertEquals('Developers_0', $groups[0]->getName());
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($result[0]));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($groups[0]));
$this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($result[0]));
$this->assertEquals(UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($groups[0]));
$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups);
$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups[0]->getUsers());

3
tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php
View File

@ -5,13 +5,14 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsGroup;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* ManyToManyEventTest
*
* @author Francisco Facioni <fran6co@gmail.com>
*/
class ManyToManyEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ManyToManyEventTest extends OrmFunctionalTestCase
{
/**
* @var PostUpdateListener

11
tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php
View File

@ -1,13 +1,16 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\DirectoryTree\Directory;
use Doctrine\Tests\Models\DirectoryTree\File;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* MappedSuperclassTest
*
* @author robo
*/
class MappedSuperclassTest extends \Doctrine\Tests\OrmFunctionalTestCase
class MappedSuperclassTest extends OrmFunctionalTestCase
{
protected function setUp() {
$this->useModelSet('directorytree');
@ -16,15 +19,15 @@ class MappedSuperclassTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testCRUD()
{
$root = new \Doctrine\Tests\Models\DirectoryTree\Directory();
$root = new Directory();
$root->setName('Root');
$root->setPath('/root');
$directory = new \Doctrine\Tests\Models\DirectoryTree\Directory($root);
$directory = new Directory($root);
$directory->setName('TestA');
$directory->setPath('/root/dir');
$file = new \Doctrine\Tests\Models\DirectoryTree\File($directory);
$file = new File($directory);
$file->setName('test-b.html');
$this->_em->persist($root);

3
tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php
View File

@ -4,8 +4,9 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\MixedToOneIdentity\CompositeToOneKeyState;
use Doctrine\Tests\Models\MixedToOneIdentity\Country;
use Doctrine\Tests\OrmFunctionalTestCase;
class MergeCompositeToOneKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class MergeCompositeToOneKeyTest extends OrmFunctionalTestCase
{
/**
* {@inheritDoc}

8
tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
View File

@ -13,17 +13,19 @@ use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsEmail;
use Doctrine\Tests\Models\Company\CompanyEmployee;
use Doctrine\Tests\Models\Company\CompanyPerson;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* NativeQueryTest
*
* @author robo
*/
class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
class NativeQueryTest extends OrmFunctionalTestCase
{
private $platform = null;
protected function setUp() {
protected function setUp()
{
$this->useModelSet('cms');
$this->useModelSet('company');
parent::setUp();
@ -197,7 +199,7 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$rsm = new ResultSetMapping;
$q = $this->_em->createNativeQuery('SELECT id, name, status, phonenumber FROM cms_users INNER JOIN cms_phonenumbers ON id = user_id WHERE username = ?', $rsm);
$q2 = $q->setSql('foo', $rsm)
$q2 = $q->setSQL('foo')
->setResultSetMapping($rsm)
->expireResultCache(true)
->setHint('foo', 'bar')

3
tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
View File

@ -7,11 +7,12 @@ use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsEmail;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1574
*/
class NewOperatorTest extends \Doctrine\Tests\OrmFunctionalTestCase
class NewOperatorTest extends OrmFunctionalTestCase
{
/**
* @var array

13
tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
View File

@ -1,18 +1,21 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection,
Doctrine\Common\NotifyPropertyChanged,
Doctrine\Common\PropertyChangedListener;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\NotifyPropertyChanged;
use Doctrine\Common\PropertyChangedListener;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* NativeQueryTest
*
* @author robo
*/
class NotifyPolicyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class NotifyPolicyTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(array(

3
tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
View File

@ -5,11 +5,12 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
use Doctrine\Tests\Models\ECommerce\ECommerceFeature;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-one association mapping (without inheritance).
*/
class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToManyBidirectionalAssociationTest extends OrmFunctionalTestCase
{
private $product;
private $firstFeature;

3
tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php
View File

@ -4,11 +4,12 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-many association mapping with orphan removal.
*/
class OneToManyOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToManyOrphanRemovalTest extends OrmFunctionalTestCase
{
protected $userId;

3
tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
View File

@ -5,11 +5,12 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\ECommerce\ECommerceCategory;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-one association mapping (without inheritance).
*/
class OneToManySelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToManySelfReferentialAssociationTest extends OrmFunctionalTestCase
{
private $parent;
private $firstChild;

3
tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
View File

@ -5,11 +5,12 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Routing\RoutingRoute;
use Doctrine\Tests\Models\Routing\RoutingLocation;
use Doctrine\Tests\Models\Routing\RoutingLeg;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-one association mapping (without inheritance).
*/
class OneToManyUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToManyUnidirectionalAssociationTest extends OrmFunctionalTestCase
{
protected $locations = array();

5
tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
View File

@ -6,11 +6,12 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCart;
use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-one association mapping (without inheritance).
*/
class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToOneBidirectionalAssociationTest extends OrmFunctionalTestCase
{
private $customer;
private $cart;
@ -88,7 +89,7 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional
$customer = $result[0];
$this->assertNull($customer->getMentor());
$this->assertInstanceOF('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart());
$this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart());
$this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getCart());
$this->assertEquals('paypal', $customer->getCart()->getPayment());
}

9
tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
View File

@ -1,16 +1,19 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Tools\SchemaTool;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-952
*/
class OneToOneEagerLoadingTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToOneEagerLoadingTest extends OrmFunctionalTestCase
{
protected function setUp()
{
parent::setUp();
$schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em);
$schemaTool = new SchemaTool($this->_em);
try {
$schemaTool->createSchema(array(
$this->_em->getClassMetadata('Doctrine\Tests\ORM\Functional\Train'),
@ -248,7 +251,7 @@ class Train
public function __construct(TrainOwner $owner)
{
$this->waggons = new \Doctrine\Common\Collections\ArrayCollection();
$this->waggons = new ArrayCollection();
$this->setOwner($owner);
}

3
tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php
View File

@ -5,11 +5,12 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsEmail,
Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a bidirectional one-to-one association mapping with orphan removal.
*/
class OneToOneOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToOneOrphanRemovalTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
View File

@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a self referential one-to-one association mapping (without inheritance).
@ -13,7 +14,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
* for receiving support.
* Inverse side is not present.
*/
class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToOneSelfReferentialAssociationTest extends OrmFunctionalTestCase
{
private $customer;
private $mentor;

3
tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
View File

@ -7,12 +7,13 @@ use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests a unidirectional one-to-one association mapping (without inheritance).
* Inverse side is not present.
*/
class OneToOneUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OneToOneUnidirectionalAssociationTest extends OrmFunctionalTestCase
{
private $product;
private $shipping;

3
tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
View File

@ -6,8 +6,9 @@ use Doctrine\Tests\Models\Routing\RoutingRoute;
use Doctrine\Tests\Models\Routing\RoutingLocation;
use Doctrine\Tests\Models\Routing\RoutingLeg;
use Doctrine\Tests\Models\Routing\RoutingRouteBooking;
use Doctrine\Tests\OrmFunctionalTestCase;
class OrderedCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OrderedCollectionTest extends OrmFunctionalTestCase
{
protected $locations = array();

6
tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
View File

@ -3,15 +3,17 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Query;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional tests for the Single Table Inheritance mapping strategy.
*
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
class OrderedJoinedTableInheritanceCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OrderedJoinedTableInheritanceCollectionTest extends OrmFunctionalTestCase
{
protected function setUp() {
protected function setUp()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(array(

3
tests/Doctrine/Tests/ORM/Functional/PaginationTest.php
View File

@ -13,12 +13,13 @@ use Doctrine\Tests\Models\Pagination\Company;
use Doctrine\Tests\Models\Pagination\Department;
use Doctrine\Tests\Models\Pagination\Logo;
use Doctrine\Tests\Models\Pagination\User1;
use Doctrine\Tests\OrmFunctionalTestCase;
use ReflectionMethod;
/**
* @group DDC-1613
*/
class PaginationTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PaginationTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/PersistentCollectionCriteriaTest.php
View File

@ -23,11 +23,12 @@ use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\User as QuoteUser;
use Doctrine\Tests\Models\Tweet\Tweet;
use Doctrine\Tests\Models\Tweet\User as TweetUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @author Michaël Gallego <mic.gallego@gmail.com>
*/
class PersistentCollectionCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PersistentCollectionCriteriaTest extends OrmFunctionalTestCase
{
protected function setUp()
{

6
tests/Doctrine/Tests/ORM/Functional/PersistentCollectionTest.php
View File

@ -2,12 +2,14 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Common\Persistence\PersistentObject;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
*/
class PersistentCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PersistentCollectionTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -114,7 +116,7 @@ class PersistentCollectionHolder extends PersistentObject
public function __construct()
{
$this->collection = new \Doctrine\Common\Collections\ArrayCollection();
$this->collection = new ArrayCollection();
}
/**

3
tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php
View File

@ -3,6 +3,7 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Persistence\PersistentObject;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Test that Doctrine ORM correctly works with the ObjectManagerAware and PersistentObject
@ -10,7 +11,7 @@ use Doctrine\Common\Persistence\PersistentObject;
*
* @group DDC-1448
*/
class PersistentObjectTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PersistentObjectTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php
View File

@ -5,13 +5,14 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\ORM\Event\PostFlushEventArgs;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* PostFlushEventTest
*
* @author Daniel Freudenberger <df@rebuy.de>
*/
class PostFlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PostFlushEventTest extends OrmFunctionalTestCase
{
/**
* @var PostFlushListener

3
tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
View File

@ -8,13 +8,14 @@ use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsEmail;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* PostLoadEventTest
*
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
*/
class PostLoadEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PostLoadEventTest extends OrmFunctionalTestCase
{
/**
* @var integer

3
tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
View File

@ -3,13 +3,14 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* QueryCacheTest
*
* @author robo
*/
class QueryCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
class QueryCacheTest extends OrmFunctionalTestCase
{
/**
* @var \ReflectionProperty

3
tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
View File

@ -3,13 +3,14 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Company\CompanyManager;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional Query tests.
*
* @author robo
*/
class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
class QueryDqlFunctionTest extends OrmFunctionalTestCase
{
protected function setUp()
{

10
tests/Doctrine/Tests/ORM/Functional/QueryTest.php
View File

@ -4,19 +4,21 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\UnexpectedResultException;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsArticle,
Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\Parameter;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional Query tests.
*
* @author robo
*/
class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
class QueryTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -390,7 +392,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
try {
$query = $this->_em->createQuery('UPDATE CMS:CmsUser u SET u.name = ?1');
$this->assertEquals('UPDATE cms_users SET name = ?', $query->getSql());
$this->assertEquals('UPDATE cms_users SET name = ?', $query->getSQL());
$query->free();
} catch (\Exception $e) {
$this->fail($e->getMessage());
@ -753,7 +755,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
try {
$this->_em->createQuery($dql)->getSingleResult();
$this->fail('Expected exception "\Doctrine\ORM\NoResultException".');
} catch (\Doctrine\ORM\UnexpectedResultException $exc) {
} catch (UnexpectedResultException $exc) {
$this->assertInstanceOf('\Doctrine\ORM\NoResultException', $exc);
}
@ -766,7 +768,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
try {
$this->_em->createQuery($dql)->getSingleResult();
$this->fail('Expected exception "\Doctrine\ORM\NonUniqueResultException".');
} catch (\Doctrine\ORM\UnexpectedResultException $exc) {
} catch (UnexpectedResultException $exc) {
$this->assertInstanceOf('\Doctrine\ORM\NonUniqueResultException', $exc);
}
}

3
tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
View File

@ -1,13 +1,14 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional Query tests.
*
* @group DDC-692
*/
class ReadOnlyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ReadOnlyTest extends OrmFunctionalTestCase
{
protected function setUp()
{

8
tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
View File

@ -2,18 +2,20 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Util\ClassUtils;
use Doctrine\ORM\Proxy\ProxyFactory;
use Doctrine\ORM\Proxy\ProxyClassGenerator;
use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
use Doctrine\Tests\Models\Company\CompanyAuction;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests the generation of a proxy object for lazy loading.
* @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
* @author Benjamin Eberlei <kontakt@beberlei.de>
*/
class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ReferenceProxyTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -230,9 +232,9 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase
{
$id = $this->createProduct();
/* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */
/* @var $entity ECommerceProduct */
$entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id);
$className = \Doctrine\Common\Util\ClassUtils::getClass($entity);
$className = ClassUtils::getClass($entity);
$this->assertInstanceOf('Doctrine\Common\Persistence\Proxy', $entity);
$this->assertFalse($entity->__isInitialized());

9
tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php
View File

@ -2,16 +2,19 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* ResultCacheTest
*
* @author robo
*/
class ResultCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ResultCacheTest extends OrmFunctionalTestCase
{
/**
* @var \ReflectionProperty
@ -133,7 +136,7 @@ class ResultCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testNativeQueryResultCaching()
{
$cache = new ArrayCache();
$rsm = new \Doctrine\ORM\Query\ResultSetMapping();
$rsm = new ResultSetMapping();
$rsm->addScalarResult('id', 'u', 'integer');
@ -190,7 +193,7 @@ class ResultCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
$cache = $query->getResultCacheDriver();
$cacheCount = $this->getCacheSize($cache);
$this->assertNotEquals(\Doctrine\ORM\Query::HYDRATE_ARRAY, $query->getHydrationMode());
$this->assertNotEquals(Query::HYDRATE_ARRAY, $query->getHydrationMode());
$query->getArrayResult();
$this->assertEquals($cacheCount, $this->getCacheSize($cache));

14
tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
View File

@ -3,6 +3,7 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\ORM\Configuration;
use Doctrine\ORM\Query\Filter\SQLFilter;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Common\Cache\ArrayCache;
@ -21,6 +22,7 @@ use Doctrine\Tests\Models\Company\CompanyAuction;
use Doctrine\Tests\Models\Company\CompanyFlexContract;
use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests SQLFilter functionality.
@ -29,7 +31,7 @@ use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
*
* @group non-cacheable
*/
class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
class SQLFilterTest extends OrmFunctionalTestCase
{
private $userId, $userId2, $articleId, $articleId2;
private $groupId, $groupId2;
@ -54,7 +56,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testConfigureFilter()
{
$config = new \Doctrine\ORM\Configuration();
$config = new Configuration();
$config->addFilter("locale", "\Doctrine\Tests\ORM\Functional\MyLocaleFilter");
@ -69,7 +71,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
// Enable an existing filter
$filter = $em->getFilters()->enable("locale");
$this->assertTrue($filter instanceof \Doctrine\Tests\ORM\Functional\MyLocaleFilter);
$this->assertTrue($filter instanceof MyLocaleFilter);
// Enable the filter again
$filter2 = $em->getFilters()->enable("locale");
@ -223,7 +225,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
->with($this->equalTo('en'))
->will($this->returnValue("'en'"));
$em = $this->getMockEntityManager($conn);
$em = $this->getMockEntityManager();
$em->expects($this->once())
->method('getConnection')
->will($this->returnValue($conn));
@ -249,7 +251,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
// Setup mock connection
$conn = $this->getMockConnection();
$em = $this->getMockEntityManager($conn);
$em = $this->getMockEntityManager();
$em->expects($this->once())
->method('getConnection')
->will($this->returnValue($conn));
@ -271,7 +273,7 @@ class SQLFilterTest extends \Doctrine\Tests\OrmFunctionalTestCase
->with($this->equalTo('en'))
->will($this->returnValue("'en'"));
$em = $this->getMockEntityManager($conn);
$em = $this->getMockEntityManager();
$em->expects($this->once())
->method('getConnection')
->will($this->returnValue($conn));

3
tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
View File

@ -3,13 +3,14 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Functional tests for the Class Table Inheritance mapping strategy.
*
* @author robo
*/
class CompanySchemaTest extends \Doctrine\Tests\OrmFunctionalTestCase
class CompanySchemaTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/SchemaTool/DBAL483Test.php
View File

@ -3,8 +3,9 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\ORM\Tools;
use Doctrine\Tests\OrmFunctionalTestCase;
class DBAL483Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DBAL483Test extends OrmFunctionalTestCase
{
public function setUp()
{

6
tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
View File

@ -2,12 +2,14 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\DBAL\Schema\Comparator;
use Doctrine\ORM\Tools;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* WARNING: This test should be run as last test! It can affect others very easily!
*/
class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC214Test extends OrmFunctionalTestCase
{
private $classes = array();
private $schemaTool = null;
@ -78,7 +80,7 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
$fromSchema = $sm->createSchema();
$toSchema = $this->schemaTool->getSchemaFromMetadata($classMetadata);
$comparator = new \Doctrine\DBAL\Schema\Comparator();
$comparator = new Comparator();
$schemaDiff = $comparator->compare($fromSchema, $toSchema);
$sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform());

3
tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
View File

@ -3,8 +3,9 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\ORM\Tools\SchemaTool;
use Doctrine\Tests\OrmFunctionalTestCase;
class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
class PostgreSqlSchemaToolTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php
View File

@ -3,13 +3,14 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Tools\SchemaValidator;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Test the validity of all modelsets
*
* @group DDC-1601
*/
class SchemaValidatorTest extends \Doctrine\Tests\OrmFunctionalTestCase
class SchemaValidatorTest extends OrmFunctionalTestCase
{
static public function dataValidateModelSets()
{

6
tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheConcurrentTest.php
View File

@ -2,9 +2,11 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Cache\DefaultCacheFactory;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Tests\Mocks\ConcurrentRegionMock;
use Doctrine\ORM\Cache\Region\DefaultRegion;
use Doctrine\Tests\Mocks\TimestampRegionMock;
use Doctrine\Tests\Models\Cache\Country;
use Doctrine\ORM\Cache\CollectionCacheKey;
use Doctrine\ORM\Cache\EntityCacheKey;
@ -126,7 +128,7 @@ class SecondLevelCacheConcurrentTest extends SecondLevelCacheAbstractTest
}
}
class CacheFactorySecondLevelCacheConcurrentTest extends \Doctrine\ORM\Cache\DefaultCacheFactory
class CacheFactorySecondLevelCacheConcurrentTest extends DefaultCacheFactory
{
public function __construct(Cache $cache)
{
@ -143,6 +145,6 @@ class CacheFactorySecondLevelCacheConcurrentTest extends \Doctrine\ORM\Cache\Def
public function getTimestampRegion()
{
return new \Doctrine\Tests\Mocks\TimestampRegionMock();
return new TimestampRegionMock();
}
}

3
tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
View File

@ -2,6 +2,7 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\AbstractQuery;
use Doctrine\Tests\Models\Cache\Country;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Tests\Models\Cache\State;
@ -716,7 +717,7 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest
$this->secondLevelCacheLogger->clearStats();
$this->_em->clear();
$getHash = function(\Doctrine\ORM\AbstractQuery $query){
$getHash = function(AbstractQuery $query){
$method = new \ReflectionMethod($query, 'getHash');
$method->setAccessible(true);

3
tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
View File

@ -3,8 +3,9 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Schema\Sequence;
use Doctrine\Tests\OrmFunctionalTestCase;
class SequenceEmulatedIdentityStrategyTest extends \Doctrine\Tests\OrmFunctionalTestCase
class SequenceEmulatedIdentityStrategyTest extends OrmFunctionalTestCase
{
/**
* {@inheritdoc}

3
tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
View File

@ -1,13 +1,14 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Description of SequenceGeneratorTest
*
* @author robo
*/
class SequenceGeneratorTest extends \Doctrine\Tests\OrmFunctionalTestCase
class SequenceGeneratorTest extends OrmFunctionalTestCase
{
public function setUp()
{

27
tests/Doctrine/Tests/ORM/Functional/SingleTableInheritanceTest.php
View File

@ -4,8 +4,13 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Tests\Models\Company\CompanyEmployee;
use Doctrine\Tests\Models\Company\CompanyFixContract;
use Doctrine\Tests\Models\Company\CompanyFlexContract;
use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
use Doctrine\Tests\OrmFunctionalTestCase;
class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
class SingleTableInheritanceTest extends OrmFunctionalTestCase
{
private $salesPerson;
private $engineers = array();
@ -21,30 +26,30 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function persistRelatedEmployees()
{
$this->salesPerson = new \Doctrine\Tests\Models\Company\CompanyEmployee();
$this->salesPerson = new CompanyEmployee();
$this->salesPerson->setName('Poor Sales Guy');
$this->salesPerson->setDepartment('Sales');
$this->salesPerson->setSalary(100);
$engineer1 = new \Doctrine\Tests\Models\Company\CompanyEmployee();
$engineer1 = new CompanyEmployee();
$engineer1->setName('Roman B.');
$engineer1->setDepartment('IT');
$engineer1->setSalary(100);
$this->engineers[] = $engineer1;
$engineer2 = new \Doctrine\Tests\Models\Company\CompanyEmployee();
$engineer2 = new CompanyEmployee();
$engineer2->setName('Jonathan W.');
$engineer2->setDepartment('IT');
$engineer2->setSalary(100);
$this->engineers[] = $engineer2;
$engineer3 = new \Doctrine\Tests\Models\Company\CompanyEmployee();
$engineer3 = new CompanyEmployee();
$engineer3->setName('Benjamin E.');
$engineer3->setDepartment('IT');
$engineer3->setSalary(100);
$this->engineers[] = $engineer3;
$engineer4 = new \Doctrine\Tests\Models\Company\CompanyEmployee();
$engineer4 = new CompanyEmployee();
$engineer4->setName('Guilherme B.');
$engineer4->setDepartment('IT');
$engineer4->setSalary(100);
@ -61,14 +66,14 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
{
$this->persistRelatedEmployees();
$this->fix = new \Doctrine\Tests\Models\Company\CompanyFixContract();
$this->fix = new CompanyFixContract();
$this->fix->setFixPrice(1000);
$this->fix->setSalesPerson($this->salesPerson);
$this->fix->addEngineer($this->engineers[0]);
$this->fix->addEngineer($this->engineers[1]);
$this->fix->markCompleted();
$this->flex = new \Doctrine\Tests\Models\Company\CompanyFlexContract();
$this->flex = new CompanyFlexContract();
$this->flex->setSalesPerson($this->salesPerson);
$this->flex->setHoursWorked(100);
$this->flex->setPricePerHour(100);
@ -77,7 +82,7 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->flex->addEngineer($this->engineers[3]);
$this->flex->markCompleted();
$this->ultra = new \Doctrine\Tests\Models\Company\CompanyFlexUltraContract();
$this->ultra = new CompanyFlexUltraContract();
$this->ultra->setSalesPerson($this->salesPerson);
$this->ultra->setHoursWorked(150);
$this->ultra->setPricePerHour(150);
@ -96,7 +101,7 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
{
$this->persistRelatedEmployees();
$fixContract = new \Doctrine\Tests\Models\Company\CompanyFixContract();
$fixContract = new CompanyFixContract();
$fixContract->setFixPrice(1000);
$fixContract->setSalesPerson($this->salesPerson);
@ -115,7 +120,7 @@ class SingleTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase
{
$this->persistRelatedEmployees();
$ultraContract = new \Doctrine\Tests\Models\Company\CompanyFlexUltraContract();
$ultraContract = new CompanyFlexUltraContract();
$ultraContract->setSalesPerson($this->salesPerson);
$ultraContract->setHoursWorked(100);
$ultraContract->setPricePerHour(50);

5
tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
View File

@ -8,12 +8,13 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCart,
Doctrine\Tests\Models\ECommerce\ECommerceProduct;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests capabilities of the persister.
* @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
*/
class StandardEntityPersisterTest extends \Doctrine\Tests\OrmFunctionalTestCase
class StandardEntityPersisterTest extends OrmFunctionalTestCase
{
protected function setUp()
{
@ -56,7 +57,7 @@ class StandardEntityPersisterTest extends \Doctrine\Tests\OrmFunctionalTestCase
$p = new ECommerceProduct;
$p->addFeature($f1);
$p->addfeature($f2);
$p->addFeature($f2);
$this->_em->persist($p);
$this->_em->flush();

2
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php
View File

@ -24,7 +24,7 @@ class DDC1050Test extends OrmFunctionalTestCase
for ($i = 2; $i < 10000; ++$i) {
$user = new CmsUser();
$user->status = 'developer';
$user->username = 'jwage'+$i;
$user->username = 'jwage'.$i;
$user->name = 'Jonathan';
$this->_em->persist($user);
}

2
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
View File

@ -57,7 +57,7 @@ class DDC1080Test extends OrmFunctionalTestCase
$this->_em->flush();
$this->_em->clear();
$foo = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC1080Foo', $foo1->getFooId());
$foo = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC1080Foo', $foo1->getFooID());
$fooBars = $foo->getFooBars();
$this->assertEquals(3, count($fooBars), "Should return three foobars.");

2
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1643Test.php
View File

@ -105,7 +105,7 @@ class DDC1643Test extends \Doctrine\Tests\OrmFunctionalTestCase
$user2->groups = $user1->groups;
$user2->groups->add($group3);
$this->assertEQuals(1, count($user1->groups->getInsertDiff()));
$this->assertCount(1, $user1->groups->getInsertDiff());
$this->_em->persist($group3);
$this->_em->flush();

8
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1707Test.php
View File

@ -2,12 +2,13 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Events;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1707
*/
class DDC1707Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1707Test extends OrmFunctionalTestCase
{
public function setUp()
{
@ -27,9 +28,8 @@ class DDC1707Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
$class = $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1707Child');
$entity = new DDC1707Child();
$event = new LifecycleEventArgs($entity, $this->_em);
$class->invokeLifecycleCallbacks(\Doctrine\ORM\Events::postLoad, $entity, $event);
$class->invokeLifecycleCallbacks(Events::postLoad, $entity);
$this->assertTrue($entity->postLoad);
}

4
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1778Test.php
View File

@ -23,9 +23,9 @@ class DDC1778Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->user->name = "Benjamin";
$this->user->status = "active";
$this->phone = new CmsPhoneNumber();
$this->phone = new CmsPhonenumber();
$this->phone->phonenumber = '0123456789';
$this->user->addPhoneNumber($this->phone);
$this->user->addPhonenumber($this->phone);
$this->_em->persist($this->user);
$this->_em->persist($this->phone);

2
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
View File

@ -22,7 +22,7 @@ class DDC331Test extends \Doctrine\Tests\OrmFunctionalTestCase
$q = $this->_em->createQuery('SELECT e.name FROM Doctrine\Tests\Models\Company\CompanyEmployee e');
$this->assertEquals(
strtolower('SELECT c0_.name AS name_0 FROM company_employees c1_ INNER JOIN company_persons c0_ ON c1_.id = c0_.id LEFT JOIN company_managers c2_ ON c1_.id = c2_.id'),
strtolower($q->getSql())
strtolower($q->getSQL())
);
}
}

4
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
View File

@ -24,10 +24,10 @@ class DDC656Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->persist($entity);
$this->_em->getUnitOfWork()->computeChangeSet($this->_em->getClassMetadata(get_class($entity)), $entity);
$data1 = $this->_em->getUnitOfWork()->getEntityChangeset($entity);
$data1 = $this->_em->getUnitOfWork()->getEntityChangeSet($entity);
$entity->setType('type2');
$this->_em->getUnitOfWork()->recomputeSingleEntityChangeSet($this->_em->getClassMetadata(get_class($entity)), $entity);
$data2 = $this->_em->getUnitOfWork()->getEntityChangeset($entity);
$data2 = $this->_em->getUnitOfWork()->getEntityChangeSet($entity);
$this->assertEquals(array_keys($data1), array_keys($data2));

2
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php
View File

@ -22,7 +22,7 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase
*/
private function setCascadeMergeFor($class)
{
$metadata = $this->_em->getMetadataFactory()->getMetaDataFor($class);
$metadata = $this->_em->getMetadataFactory()->getMetadataFor($class);
foreach ($metadata->associationMappings as $key => $associationMapping) {
$metadata->associationMappings[$key]["isCascadePersist"] = false;
$metadata->associationMappings[$key]["isCascadeMerge"] = true;

3
tests/Doctrine/Tests/ORM/Functional/TypeTest.php
View File

@ -9,8 +9,9 @@ use Doctrine\Tests\Models\Generic\SerializationModel;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\Tests\OrmFunctionalTestCase;
class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
class TypeTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php
View File

@ -6,8 +6,9 @@ use Doctrine\Tests\Models\CustomType\CustomTypeChild;
use Doctrine\Tests\Models\CustomType\CustomTypeParent;
use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\Tests\OrmFunctionalTestCase;
class TypeValueSqlTest extends \Doctrine\Tests\OrmFunctionalTestCase
class TypeValueSqlTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/UUIDGeneratorTest.php
View File

@ -1,10 +1,11 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-451
*/
class UUIDGeneratorTest extends \Doctrine\Tests\OrmFunctionalTestCase
class UUIDGeneratorTest extends OrmFunctionalTestCase
{
public function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/UnitOfWorkLifecycleTest.php
View File

@ -3,8 +3,9 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
class UnitOfWorkLifecycleTest extends \Doctrine\Tests\OrmFunctionalTestCase
class UnitOfWorkLifecycleTest extends OrmFunctionalTestCase
{
protected function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/ValueObjectsTest.php
View File

@ -1,11 +1,12 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-93
*/
class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ValueObjectsTest extends OrmFunctionalTestCase
{
public function setUp()
{

3
tests/Doctrine/Tests/ORM/Functional/VersionedOneToOneTest.php
View File

@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\VersionedOneToOne\FirstRelatedEntity;
use Doctrine\Tests\Models\VersionedOneToOne\SecondRelatedEntity;
use Doctrine\ORM\ORMException;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Tests that an entity with a OneToOne relationship defined as the id, with a version field can be created.
@ -13,7 +14,7 @@ use Doctrine\ORM\ORMException;
*
* @group VersionedOneToOne
*/
class VersionedOneToOneTest extends \Doctrine\Tests\OrmFunctionalTestCase
class VersionedOneToOneTest extends OrmFunctionalTestCase
{
protected function setUp()
{

26
tests/Doctrine/Tests/ORM/Query/ExprTest.php
View File

@ -120,20 +120,20 @@ class ExprTest extends OrmTestCase
public function testAndExpr()
{
$this->assertEquals('1 = 1 AND 2 = 2', (string) $this->_expr->andx((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2)));
$this->assertEquals('1 = 1 AND 2 = 2', (string) $this->_expr->andX((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2)));
}
public function testIntelligentParenthesisPreventionAndExpr()
{
$this->assertEquals(
'1 = 1 AND 2 = 2',
(string) $this->_expr->andx($this->_expr->orx($this->_expr->andx($this->_expr->eq(1, 1))), (string) $this->_expr->eq(2, 2))
(string) $this->_expr->andX($this->_expr->orX($this->_expr->andX($this->_expr->eq(1, 1))), (string) $this->_expr->eq(2, 2))
);
}
public function testOrExpr()
{
$this->assertEquals('1 = 1 OR 2 = 2', (string) $this->_expr->orx((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2)));
$this->assertEquals('1 = 1 OR 2 = 2', (string) $this->_expr->orX((string) $this->_expr->eq(1, 1), (string) $this->_expr->eq(2, 2)));
}
public function testAbsExpr()
@ -311,11 +311,11 @@ class ExprTest extends OrmTestCase
public function testAndxOrxExpr()
{
$andExpr = $this->_expr->andx();
$andExpr = $this->_expr->andX();
$andExpr->add($this->_expr->eq(1, 1));
$andExpr->add($this->_expr->lt(1, 5));
$orExpr = $this->_expr->orx();
$orExpr = $this->_expr->orX();
$orExpr->add($andExpr);
$orExpr->add($this->_expr->eq(1, 1));
@ -324,7 +324,7 @@ class ExprTest extends OrmTestCase
public function testOrxExpr()
{
$orExpr = $this->_expr->orx();
$orExpr = $this->_expr->orX();
$orExpr->add($this->_expr->eq(1, 1));
$orExpr->add($this->_expr->lt(1, 5));
@ -356,7 +356,7 @@ class ExprTest extends OrmTestCase
*/
public function testAddThrowsException()
{
$orExpr = $this->_expr->orx();
$orExpr = $this->_expr->orX();
$orExpr->add($this->_expr->quot(5, 2));
}
@ -433,15 +433,17 @@ class ExprTest extends OrmTestCase
$this->assertEquals(array('foo', 'bar'), $select->getParts());
}
public function testAddEmpty() {
$andExpr = $this->_expr->andx();
$andExpr->add($this->_expr->andx());
public function testAddEmpty()
{
$andExpr = $this->_expr->andX();
$andExpr->add($this->_expr->andX());
$this->assertEquals(0, $andExpr->count());
}
public function testAddNull() {
$andExpr = $this->_expr->andx();
public function testAddNull()
{
$andExpr = $this->_expr->andX();
$andExpr->add(null);
$this->assertEquals(0, $andExpr->count());

2
tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
View File

@ -50,7 +50,7 @@ class LanguageRecognitionTest extends OrmTestCase
{
$query = $this->_em->createQuery($dql);
$query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true);
$query->setDql($dql);
$query->setDQL($dql);
foreach ($hints as $key => $value) {
$query->setHint($key, $value);

4
tests/Doctrine/Tests/ORM/Query/QueryTest.php
View File

@ -74,7 +74,7 @@ class QueryTest extends OrmTestCase
$cloned = clone $query;
$this->assertEquals($dql, $cloned->getDql());
$this->assertEquals($dql, $cloned->getDQL());
$this->assertEquals(0, count($cloned->getParameters()));
$this->assertFalse($cloned->getHint('foo'));
}
@ -92,7 +92,7 @@ class QueryTest extends OrmTestCase
->setParameters(new ArrayCollection(array(new Parameter(2, 'baz'))))
->setResultCacheDriver(null)
->setResultCacheId('foo')
->setDql('foo')
->setDQL('foo')
->setFirstResult(10)
->setMaxResults(10);

10
tests/Doctrine/Tests/ORM/QueryBuilderTest.php
View File

@ -51,7 +51,7 @@ class QueryBuilderTest extends OrmTestCase
protected function assertValidQueryBuilder(QueryBuilder $qb, $expectedDql)
{
$dql = $qb->getDql();
$dql = $qb->getDQL();
$q = $qb->getQuery();
$this->assertEquals($expectedDql, $dql);
@ -632,7 +632,7 @@ class QueryBuilderTest extends OrmTestCase
$qb = $this->_em->createQueryBuilder();
$qb->select('u')
->from('Doctrine\Tests\Models\CMS\CmsUser', 'u')
->where($qb->expr()->orx('u.username = :username', 'u.username = :username2'));
->where($qb->expr()->orX('u.username = :username', 'u.username = :username2'));
$parameters = new ArrayCollection();
$parameters->add(new Parameter('username', 'jwage'));
@ -788,7 +788,7 @@ class QueryBuilderTest extends OrmTestCase
$q1 = $qb->getQuery();
$this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name', $q1->getDql());
$this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name', $q1->getDQL());
$this->assertEquals(1, count($q1->getParameters()));
// add another condition and construct a second query
@ -797,7 +797,7 @@ class QueryBuilderTest extends OrmTestCase
$q2 = $qb->getQuery();
$this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name AND u.id = :id', $q2->getDql());
$this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = :name AND u.id = :id', $q2->getDQL());
$this->assertTrue($q1 !== $q2); // two different, independent queries
$this->assertEquals(2, count($q2->getParameters()));
$this->assertEquals(1, count($q1->getParameters())); // $q1 unaffected
@ -843,7 +843,7 @@ class QueryBuilderTest extends OrmTestCase
$this->assertEquals('u.username = ?1', (string)$qb->getDQLPart('where'));
$this->assertEquals(1, count($qb->getDQLPart('orderBy')));
$qb->resetDqlPart('where')->resetDqlPart('orderBy');
$qb->resetDQLPart('where')->resetDQLPart('orderBy');
$this->assertNull($qb->getDQLPart('where'));
$this->assertEquals(0, count($qb->getDQLPart('orderBy')));

2
tests/Doctrine/Tests/ORM/Tools/Console/Command/GenerateRepositoriesCommandTest.php
View File

@ -62,7 +62,7 @@ class GenerateRepositoriesCommandTest extends OrmFunctionalTestCase
if ($file->isFile()) {
\unlink($file->getPathname());
} elseif ($file->getBasename() === '.') {
$dirs[] = $file->getRealpath();
$dirs[] = $file->getRealPath();
}
}

2
tests/Doctrine/Tests/ORM/Tools/EntityRepositoryGeneratorTest.php
View File

@ -55,7 +55,7 @@ class EntityRepositoryGeneratorTest extends OrmTestCase
if ($file->isFile()) {
\unlink($file->getPathname());
} elseif ($file->getBasename() === '.') {
$dirs[] = $file->getRealpath();
$dirs[] = $file->getRealPath();
}
}

6
tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php
View File

@ -26,7 +26,7 @@ class CountOutputWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result) dctrn_table", $query->getSql()
"SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result) dctrn_table", $query->getSQL()
);
}
@ -38,7 +38,7 @@ class CountOutputWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_1 FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_result) dctrn_table", $query->getSql()
"SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_1 FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_result) dctrn_table", $query->getSQL()
);
}
@ -55,7 +55,7 @@ class CountOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_) dctrn_result) dctrn_table",
$query->getSql()
$query->getSQL()
);
}
}

12
tests/Doctrine/Tests/ORM/Tools/Pagination/CountWalkerTest.php
View File

@ -32,7 +32,7 @@ class CountWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT a0_.id) AS sclr_0 FROM Author a0_", $query->getSql()
"SELECT count(DISTINCT a0_.id) AS sclr_0 FROM Author a0_", $query->getSQL()
);
}
@ -45,7 +45,7 @@ class CountWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ GROUP BY b0_.id", $query->getSql()
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ GROUP BY b0_.id", $query->getSQL()
);
}
@ -58,7 +58,7 @@ class CountWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSql()
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSQL()
);
}
@ -71,7 +71,7 @@ class CountWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSql()
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ INNER JOIN Category c1_ ON b0_.category_id = c1_.id INNER JOIN Author a2_ ON b0_.author_id = a2_.id", $query->getSQL()
);
}
@ -88,7 +88,7 @@ class CountWalkerTest extends PaginationTestCase
'Cannot count query that uses a HAVING clause. Use the output walkers for pagination'
);
$query->getSql();
$query->getSQL();
}
/**
@ -103,7 +103,7 @@ class CountWalkerTest extends PaginationTestCase
$query->setFirstResult(null)->setMaxResults(null);
$this->assertEquals(
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ LEFT JOIN Category c1_ ON (b0_.category_id = c1_.id)", $query->getSql()
"SELECT count(DISTINCT b0_.id) AS sclr_0 FROM BlogPost b0_ LEFT JOIN Category c1_ ON (b0_.category_id = c1_.id)", $query->getSQL()
);
}
}

22
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
View File

@ -33,7 +33,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
$this->assertEquals(
"SELECT DISTINCT id_0, MIN(sclr_5) AS dctrn_minrownum FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS sclr_5, m0_.author_id AS author_id_6, m0_.category_id AS category_id_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSql()
"SELECT DISTINCT id_0, MIN(sclr_5) AS dctrn_minrownum FROM (SELECT m0_.id AS id_0, m0_.title AS title_1, c1_.id AS id_2, a2_.id AS id_3, a2_.name AS name_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS sclr_5, m0_.author_id AS author_id_6, m0_.category_id AS category_id_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -52,7 +52,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -71,7 +71,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -90,7 +90,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT id_1, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS sclr_0, u1_.id AS id_1, g0_.id AS id_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS sclr_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY id_1 ORDER BY dctrn_minrownum ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -118,7 +118,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
$this->assertEquals(
"SELECT DISTINCT ID_0, MIN(SCLR_5) AS dctrn_minrownum FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS SCLR_5, m0_.author_id AS AUTHOR_ID_6, m0_.category_id AS CATEGORY_ID_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSql()
"SELECT DISTINCT ID_0, MIN(SCLR_5) AS dctrn_minrownum FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, ROW_NUMBER() OVER(ORDER BY m0_.title ASC) AS SCLR_5, m0_.author_id AS AUTHOR_ID_6, m0_.category_id AS CATEGORY_ID_7 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC", $limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -138,7 +138,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT ID_1, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS SCLR_0, u1_.id AS ID_1, g0_.id AS ID_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC) AS SCLR_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY ID_1 ORDER BY dctrn_minrownum ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -158,7 +158,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT ID_1, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT COUNT(g0_.id) AS SCLR_0, u1_.id AS ID_1, g0_.id AS ID_2, ROW_NUMBER() OVER(ORDER BY COUNT(g0_.id) ASC, u1_.id DESC) AS SCLR_3 FROM User u1_ INNER JOIN user_group u2_ ON u1_.id = u2_.user_id INNER JOIN groups g0_ ON g0_.id = u2_.group_id) dctrn_result GROUP BY ID_1 ORDER BY dctrn_minrownum ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -176,7 +176,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
$this->assertEquals(
"SELECT DISTINCT ID_0 FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, m0_.author_id AS AUTHOR_ID_5, m0_.category_id AS CATEGORY_ID_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSql()
"SELECT DISTINCT ID_0 FROM (SELECT m0_.id AS ID_0, m0_.title AS TITLE_1, c1_.id AS ID_2, a2_.id AS ID_3, a2_.name AS NAME_4, m0_.author_id AS AUTHOR_ID_5, m0_.category_id AS CATEGORY_ID_6 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id) dctrn_result", $limitQuery->getSQL()
);
$this->entityManager->getConnection()->setDatabasePlatform($odp);
@ -190,7 +190,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'Doctrine\ORM\Tools\Pagination\LimitSubqueryOutputWalker');
$this->assertEquals(
"SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result", $limitQuery->getSql()
"SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_) dctrn_result", $limitQuery->getSQL()
);
}
@ -285,7 +285,7 @@ class LimitSubqueryOutputWalkerTest extends PaginationTestCase
$this->assertEquals(
'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, a0_.name AS name_2 FROM Author a0_) dctrn_result ORDER BY name_2 DESC',
$query->getSql()
$query->getSQL()
);
}
@ -374,7 +374,7 @@ ORDER BY b.id DESC'
*/
public function testLimitSubqueryOrderBySubSelectOrderByExpression()
{
$this->entityManager->getConnection()->setDatabasePlatform(new MysqlPlatform());
$this->entityManager->getConnection()->setDatabasePlatform(new MySqlPlatform());
$query = $this->entityManager->createQuery(
'SELECT a,

10
tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php
View File

@ -33,7 +33,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON m0_.category_id = c1_.id INNER JOIN Author a2_ ON m0_.author_id = a2_.id ORDER BY m0_.title ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
}
@ -47,7 +47,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT a0_.id AS id_0, sum(a0_.name) AS sclr_1 FROM Author a0_",
$limitQuery->getSql()
$limitQuery->getSQL()
);
}
@ -64,7 +64,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0, m0_.author_id AS sclr_1 FROM MyBlogPost m0_ ORDER BY m0_.author_id ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
}
@ -81,7 +81,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id)",
$limitQuery->getSql()
$limitQuery->getSQL()
);
}
@ -95,7 +95,7 @@ class LimitSubqueryWalkerTest extends PaginationTestCase
$this->assertEquals(
"SELECT DISTINCT m0_.id AS id_0, m0_.title AS title_1 FROM MyBlogPost m0_ INNER JOIN Category c1_ ON (m0_.category_id = c1_.id) ORDER BY m0_.title ASC",
$limitQuery->getSql()
$limitQuery->getSQL()
);
}
}

18
tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php
View File

@ -34,7 +34,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_ WHERE a0_.id IN (?)", $whereInQuery->getSql()
"SELECT a0_.id AS id_0, a0_.name AS name_1, sum(a0_.name) AS sclr_2 FROM Author a0_ WHERE a0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -48,7 +48,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -62,7 +62,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND 2 = 2 AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE 1 = 1 AND 2 = 2 AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -76,7 +76,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -90,7 +90,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND 3 = 3 AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 OR 2 = 2) AND 3 = 3 AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -104,7 +104,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 AND 2 = 2 OR 3 = 3) AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (1 = 1 AND 2 = 2 OR 3 = 3) AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -118,7 +118,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSql()
"SELECT u0_.id AS id_0, g1_.id AS id_1 FROM User u0_ INNER JOIN user_group u2_ ON u0_.id = u2_.user_id INNER JOIN groups g1_ ON g1_.id = u2_.group_id WHERE (NOT 1 = 2) AND u0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -134,7 +134,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSql()
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE b0_.id IN (?)", $whereInQuery->getSQL()
);
}
@ -147,7 +147,7 @@ class WhereInWalkerTest extends PaginationTestCase
$whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 10);
$this->assertEquals(
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE 1 = 1 AND b0_.id IN (?)", $whereInQuery->getSql()
"SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ INNER JOIN Category c1_ ON (b0_.category_id = c1_.id) WHERE 1 = 1 AND b0_.id IN (?)", $whereInQuery->getSQL()
);
}
}