1
0
mirror of synced 2025-03-14 00:26:08 +03:00

Optimize imports. Remove full qualified class names

This commit is contained in:
Mikhail Shamin 2016-05-11 01:55:12 +07:00
parent 59a0410951
commit bf322b903d
212 changed files with 471 additions and 515 deletions

View File

@ -28,7 +28,6 @@ use Doctrine\ORM\Cache\QueryCacheKey;
use Doctrine\DBAL\Cache\QueryCacheProfile;
use Doctrine\ORM\Cache;
use Doctrine\ORM\Query\QueryException;
/**
* Base contract for ORM queries. Base class for Query and NativeQuery.

View File

@ -234,7 +234,6 @@ class DefaultQueryCache implements QueryCache
$data = array();
$entityName = reset($rsm->aliasMap);
$hasRelation = ( ! empty($rsm->relationMap));
$metadata = $this->em->getClassMetadata($entityName);
$persister = $this->uow->getEntityPersister($entityName);
if ( ! ($persister instanceof CachedPersister)) {

View File

@ -71,7 +71,7 @@ class EntityCacheEntry implements CacheEntry
/**
* Retrieves the entity data resolving cache entries
*
* @param \Doctrine\ORM\EntityManagerInterfac $em
* @param \Doctrine\ORM\EntityManagerInterface $em
*
* @return array
*/

View File

@ -19,7 +19,6 @@
namespace Doctrine\ORM;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\Common\Persistence\ObjectRepository;
use Doctrine\Common\Collections\Selectable;

View File

@ -24,9 +24,6 @@ use PDO;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Query;
use Doctrine\ORM\Events;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PostLoadEventDispatcher;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Proxy\Proxy;

View File

@ -20,7 +20,6 @@
namespace Doctrine\ORM\Internal\Hydration;
use PDO;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query;

View File

@ -21,7 +21,6 @@ namespace Doctrine\ORM\Persisters\Collection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Persisters\SqlExpressionVisitor;
use Doctrine\ORM\Persisters\SqlValueVisitor;
use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Query;
@ -740,7 +739,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
$valueVisitor->dispatch($expression);
list($values, $types) = $valueVisitor->getParamsAndTypes();
list(, $types) = $valueVisitor->getParamsAndTypes();
return $types;
}

View File

@ -20,7 +20,6 @@
namespace Doctrine\ORM\Persisters\Collection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\Common\Proxy\Proxy;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Utility\PersisterHelper;

View File

@ -20,7 +20,6 @@
namespace Doctrine\ORM\Persisters\Entity;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\DBAL\LockMode;
use Doctrine\DBAL\Types\Type;

View File

@ -2953,7 +2953,7 @@ class Parser
/**
* EntityExpression ::= SingleValuedAssociationPathExpression | SimpleEntityExpression
*
* @return \Doctrine\ORM\Query\AST\SingleValuedAssociationPathExpression |
* @return \Doctrine\ORM\Query\AST\PathExpression |
* \Doctrine\ORM\Query\AST\SimpleEntityExpression
*/
public function EntityExpression()

View File

@ -19,7 +19,6 @@
namespace Doctrine\ORM\Query;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Mapping\MappingException;

View File

@ -18,18 +18,9 @@ use Doctrine\DBAL\Platforms\OraclePlatform;
use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
use Doctrine\DBAL\Platforms\SQLServerPlatform;
use Doctrine\ORM\Query\AST\ArithmeticExpression;
use Doctrine\ORM\Query\AST\ArithmeticFactor;
use Doctrine\ORM\Query\AST\ArithmeticTerm;
use Doctrine\ORM\Query\AST\Literal;
use Doctrine\ORM\Query\AST\OrderByClause;
use Doctrine\ORM\Query\AST\OrderByItem;
use Doctrine\ORM\Query\AST\PartialObjectExpression;
use Doctrine\ORM\Query\AST\PathExpression;
use Doctrine\ORM\Query\AST\SelectExpression;
use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
use Doctrine\ORM\Query\Expr\OrderBy;
use Doctrine\ORM\Query\Expr\Select;
use Doctrine\ORM\Query\SqlWalker;
use Doctrine\ORM\Query\AST\SelectStatement;

View File

@ -20,7 +20,6 @@ namespace Doctrine\ORM\Tools\Pagination;
use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\ORMException;
use Doctrine\ORM\Query;
use Doctrine\ORM\Query\TreeWalkerAdapter;
use Doctrine\ORM\Query\AST\Functions\IdentityFunction;

View File

@ -49,7 +49,6 @@ use Doctrine\ORM\Persisters\Entity\JoinedSubclassPersister;
use Doctrine\ORM\Persisters\Collection\OneToManyPersister;
use Doctrine\ORM\Persisters\Collection\ManyToManyPersister;
use Doctrine\ORM\Utility\IdentifierFlattener;
use Doctrine\ORM\Cache\AssociationCacheEntry;
/**
* The UnitOfWork is responsible for tracking changes to objects during an
@ -1281,7 +1280,7 @@ class UnitOfWork implements PropertyChangedListener
$extraUpdate = array($entity, $changeset);
if (isset($this->extraUpdates[$oid])) {
list($ignored, $changeset2) = $this->extraUpdates[$oid];
list(, $changeset2) = $this->extraUpdates[$oid];
$extraUpdate = array($entity, $changeset + $changeset2);
}

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\Mapping\ClassMetadata;
/**
* Mock class for ClassMetadata.
*/
class ClassMetadataMock extends \Doctrine\ORM\Mapping\ClassMetadata
class ClassMetadataMock extends ClassMetadata
{
/* Mock API */

View File

@ -1,11 +1,12 @@
<?php
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Connection;
/**
* Mock class for Connection.
*/
class ConnectionMock extends \Doctrine\DBAL\Connection
class ConnectionMock extends Connection
{
/**
* @var mixed

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Platforms\AbstractPlatform;
/**
* Mock class for DatabasePlatform.
*/
class DatabasePlatformMock extends \Doctrine\DBAL\Platforms\AbstractPlatform
class DatabasePlatformMock extends AbstractPlatform
{
/**
* @var string

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Driver\Connection;
/**
* Mock class for DriverConnection.
*/
class DriverConnectionMock implements \Doctrine\DBAL\Driver\Connection
class DriverConnectionMock implements Connection
{
/**
* @var \Doctrine\DBAL\Driver\Statement

View File

@ -2,10 +2,15 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Schema\AbstractSchemaManager;
/**
* Mock class for Driver.
*/
class DriverMock implements \Doctrine\DBAL\Driver
class DriverMock implements Driver
{
/**
* @var \Doctrine\DBAL\Platforms\AbstractPlatform|null
@ -39,7 +44,7 @@ class DriverMock implements \Doctrine\DBAL\Driver
/**
* {@inheritdoc}
*/
public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
public function getSchemaManager(Connection $conn)
{
if ($this->_schemaManagerMock == null) {
return new SchemaManagerMock($conn);
@ -55,7 +60,7 @@ class DriverMock implements \Doctrine\DBAL\Driver
*
* @return void
*/
public function setDatabasePlatform(\Doctrine\DBAL\Platforms\AbstractPlatform $platform)
public function setDatabasePlatform(AbstractPlatform $platform)
{
$this->_platformMock = $platform;
}
@ -65,7 +70,7 @@ class DriverMock implements \Doctrine\DBAL\Driver
*
* @return void
*/
public function setSchemaManager(\Doctrine\DBAL\Schema\AbstractSchemaManager $sm)
public function setSchemaManager(AbstractSchemaManager $sm)
{
$this->_schemaManagerMock = $sm;
}
@ -81,7 +86,7 @@ class DriverMock implements \Doctrine\DBAL\Driver
/**
* {@inheritdoc}
*/
public function getDatabase(\Doctrine\DBAL\Connection $conn)
public function getDatabase(Connection $conn)
{
return;
}

View File

@ -21,12 +21,14 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\Proxy\ProxyFactory;
use Doctrine\Common\EventManager;
use Doctrine\ORM\Configuration;
use Doctrine\ORM\EntityManager;
/**
* Special EntityManager mock used for testing purposes.
*/
class EntityManagerMock extends \Doctrine\ORM\EntityManager
class EntityManagerMock extends EntityManager
{
/**
* @var \Doctrine\ORM\UnitOfWork|null
@ -83,17 +85,16 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager
*
* {@inheritdoc}
*/
public static function create($conn, \Doctrine\ORM\Configuration $config = null,
\Doctrine\Common\EventManager $eventManager = null)
public static function create($conn, Configuration $config = null, EventManager $eventManager = null)
{
if (null === $config) {
$config = new \Doctrine\ORM\Configuration();
$config = new Configuration();
$config->setProxyDir(__DIR__ . '/../Proxies');
$config->setProxyNamespace('Doctrine\Tests\Proxies');
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true));
}
if (null === $eventManager) {
$eventManager = new \Doctrine\Common\EventManager();
$eventManager = new EventManager();
}
return new EntityManagerMock($conn, $config, $eventManager);

View File

@ -3,11 +3,13 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
/**
* EntityPersister implementation used for mocking during tests.
*/
class EntityPersisterMock extends \Doctrine\ORM\Persisters\Entity\BasicEntityPersister
class EntityPersisterMock extends BasicEntityPersister
{
/**
* @var array
@ -52,7 +54,7 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\Entity\BasicEntityPer
public function addInsert($entity)
{
$this->inserts[] = $entity;
if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == \Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_IDENTITY
if ( ! is_null($this->mockIdGeneratorType) && $this->mockIdGeneratorType == ClassMetadata::GENERATOR_TYPE_IDENTITY
|| $this->class->isIdGeneratorIdentity()) {
$id = $this->identityColumnValueCounter++;
$this->postInsertIds[] = array(

View File

@ -2,13 +2,15 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Driver\Statement;
/**
* This class is a mock of the Statement interface that can be passed in to the Hydrator
* to test the hydration standalone with faked result sets.
*
* @author Roman Borschel <roman@code-factory.org>
*/
class HydratorMockStatement implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
class HydratorMockStatement implements \IteratorAggregate, Statement
{
/**
* @var array

View File

@ -2,15 +2,18 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
/**
* Mock class for MappingDriver.
*/
class MetadataDriverMock implements \Doctrine\Common\Persistence\Mapping\Driver\MappingDriver
class MetadataDriverMock implements MappingDriver
{
/**
* {@inheritdoc}
*/
public function loadMetadataForClass($className, \Doctrine\Common\Persistence\Mapping\ClassMetadata $metadata)
public function loadMetadataForClass($className, ClassMetadata $metadata)
{
}

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\Query\TreeWalkerAdapter;
/**
* Mock class for TreeWalker.
*/
class MockTreeWalker extends \Doctrine\ORM\Query\TreeWalkerAdapter
class MockTreeWalker extends TreeWalkerAdapter
{
/**
* {@inheritdoc}

View File

@ -2,15 +2,18 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Schema\AbstractSchemaManager;
/**
* Mock class for AbstractSchemaManager.
*/
class SchemaManagerMock extends \Doctrine\DBAL\Schema\AbstractSchemaManager
class SchemaManagerMock extends AbstractSchemaManager
{
/**
* @param \Doctrine\DBAL\Connection $conn
*/
public function __construct(\Doctrine\DBAL\Connection $conn)
public function __construct(Connection $conn)
{
parent::__construct($conn);
}

View File

@ -3,11 +3,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Id\SequenceGenerator;
/**
* Mock class for SequenceGenerator.
*/
class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator
class SequenceMock extends SequenceGenerator
{
/**
* @var int

View File

@ -2,12 +2,14 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\DBAL\Driver\Statement;
/**
* This class is a mock of the Statement interface.
*
* @author Alexander <iam.asm89@gmail.com>
*/
class StatementMock implements \IteratorAggregate, \Doctrine\DBAL\Driver\Statement
class StatementMock implements \IteratorAggregate, Statement
{
/**
* {@inheritdoc}

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\UnitOfWork;
/**
* Mock class for UnitOfWork.
*/
class UnitOfWorkMock extends \Doctrine\ORM\UnitOfWork
class UnitOfWorkMock extends UnitOfWork
{
/**
* @var array

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\Models\DDC3579;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @Entity
* @AssociationOverrides({

View File

@ -20,8 +20,6 @@
namespace Doctrine\Tests\Models\DDC753;
use Doctrine\ORM\EntityRepository;
class DDC753InvalidRepository
{

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\Models\DDC964;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @Entity
* @AssociationOverrides({

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\Models\DDC964;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @Entity
* @AttributeOverrides({

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\Models\Legacy;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @Entity
* @Table(name="legacy_cars")

View File

@ -1,7 +1,6 @@
<?php
namespace Doctrine\Tests\Models\StockExchange;
use Doctrine\Common\Collections\ArrayCollection;
namespace Doctrine\Tests\Models\StockExchange;
/**
* Bonds have many stocks. This uses a many to many association and fails to model how many of a

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\Models\StockExchange;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @Entity
* @Table(name="exchange_stocks")

View File

@ -4,11 +4,12 @@ namespace Doctrine\Tests\ORM\Cache;
use Doctrine\ORM\Cache\EntityCacheKey;
use Doctrine\ORM\Cache\CollectionCacheKey;
use Doctrine\Tests\DoctrineTestCase;
/**
* @group DDC-2183
*/
class CacheKeyTest extends \Doctrine\Tests\DoctrineTestCase
class CacheKeyTest extends DoctrineTestCase
{
public function testEntityCacheKeyIdentifierCollision()
{

View File

@ -2,6 +2,7 @@
namespace Doctrine\Tests\ORM\Cache;
use Doctrine\Tests\Mocks\TimestampRegionMock;
use Doctrine\Tests\OrmTestCase;
use Doctrine\Tests\Mocks\CacheRegionMock;
use Doctrine\ORM\Cache\DefaultQueryCache;
@ -11,7 +12,6 @@ use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\Tests\Models\Cache\Country;
use Doctrine\Tests\Models\Cache\City;
use Doctrine\Tests\Models\Cache\State;
use Doctrine\Tests\Models\Cache\Travel;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\Tests\Models\Generic\BooleanModel;
use Doctrine\ORM\Cache\EntityCacheEntry;
@ -542,7 +542,7 @@ class DefaultQueryCacheTest extends OrmTestCase
}
class CacheFactoryDefaultQueryCacheTest extends \Doctrine\ORM\Cache\DefaultCacheFactory
class CacheFactoryDefaultQueryCacheTest extends Cache\DefaultCacheFactory
{
private $queryCache;
private $region;
@ -565,6 +565,6 @@ class CacheFactoryDefaultQueryCacheTest extends \Doctrine\ORM\Cache\DefaultCache
public function getTimestampRegion()
{
return new \Doctrine\Tests\Mocks\TimestampRegionMock();
return new TimestampRegionMock();
}
}

View File

@ -2,6 +2,7 @@
namespace Doctrine\Tests\ORM\Cache;
use Doctrine\Common\Cache\ApcCache;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\ORM\Cache\CollectionCacheEntry;
use Doctrine\ORM\Cache\Region\DefaultRegion;
@ -32,8 +33,8 @@ class DefaultRegionTest extends AbstractRegionTest
$key = new CacheKeyMock('key');
$entry = new CacheEntryMock(array('value' => 'foo'));
$region1 = new DefaultRegion('region1', new \Doctrine\Common\Cache\ApcCache());
$region2 = new DefaultRegion('region2', new \Doctrine\Common\Cache\ApcCache());
$region1 = new DefaultRegion('region1', new ApcCache());
$region2 = new DefaultRegion('region2', new ApcCache());
$this->assertFalse($region1->contains($key));
$this->assertFalse($region2->contains($key));

View File

@ -2,12 +2,10 @@
namespace Doctrine\Tests\ORM\Cache;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\Tests\Mocks\CacheEntryMock;
use Doctrine\Tests\Mocks\CacheKeyMock;
use Doctrine\ORM\Cache\Region\DefaultMultiGetRegion;
use Doctrine\ORM\Cache\CollectionCacheEntry;
use Doctrine\ORM\Cache\EntityCacheKey;
/**
* @author Asmir Mustafic <goetas@gmail.com>

View File

@ -2,6 +2,7 @@
namespace Doctrine\Tests\ORM\Cache\Persister\Collection;
use Doctrine\ORM\PersistentCollection;
use Doctrine\Tests\OrmTestCase;
use Doctrine\ORM\Cache\Region;
@ -101,7 +102,7 @@ abstract class AbstractCollectionPersisterTest extends OrmTestCase
$em = $this->em;
$class = $class ?: $this->em->getClassMetadata('Doctrine\Tests\Models\Cache\State');
$assoc = $assoc ?: $class->associationMappings['cities'];
$coll = new \Doctrine\ORM\PersistentCollection($em, $class, $elements ?: new ArrayCollection);
$coll = new PersistentCollection($em, $class, $elements ?: new ArrayCollection);
$coll->setOwner($owner, $assoc);
$coll->setInitialized(true);

View File

@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM;
use Doctrine\ORM\Internal\CommitOrderCalculator;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Tests\OrmTestCase;
/**
* Tests of the commit order calculation.
@ -12,7 +13,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
* can have many valid orderings, so you may want to build a graph that has only
* 1 valid order to simplify your tests.
*/
class CommitOrderCalculatorTest extends \Doctrine\Tests\OrmTestCase
class CommitOrderCalculatorTest extends OrmTestCase
{
private $_calc;

View File

@ -6,7 +6,6 @@ use Doctrine\Common\Proxy\AbstractProxyFactory;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\ORM\Mapping as AnnotationNamespace;
use Doctrine\ORM\Configuration;
use Doctrine\ORM\ORMException;
use ReflectionClass;
use PHPUnit_Framework_TestCase;

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Decorator;
use Doctrine\ORM\Decorator\EntityManagerDecorator;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query\ResultSetMapping;
class EntityManagerDecoratorTest extends \PHPUnit_Framework_TestCase

View File

@ -2,7 +2,9 @@
namespace Doctrine\Tests\ORM\Entity;
class ConstructorTest extends \Doctrine\Tests\OrmTestCase
use Doctrine\Tests\OrmTestCase;
class ConstructorTest extends OrmTestCase
{
public function testFieldInitializationInConstructor()
{

View File

@ -2,7 +2,10 @@
namespace Doctrine\Tests\ORM;
class EntityManagerTest extends \Doctrine\Tests\OrmTestCase
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\Tests\OrmTestCase;
class EntityManagerTest extends OrmTestCase
{
private $_em;
@ -54,7 +57,7 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase
public function testCreateNativeQuery()
{
$rsm = new \Doctrine\ORM\Query\ResultSetMapping();
$rsm = new ResultSetMapping();
$query = $this->_em->createNativeQuery('SELECT foo', $rsm);
$this->assertSame('SELECT foo', $query->getSql());
@ -65,7 +68,7 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase
*/
public function testCreateNamedNativeQuery()
{
$rsm = new \Doctrine\ORM\Query\ResultSetMapping();
$rsm = new ResultSetMapping();
$this->_em->getConfiguration()->addNamedNativeQuery('foo', 'SELECT foo', $rsm);
$query = $this->_em->createNamedNativeQuery('foo');

View File

@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Company\CompanyEmployee,
Doctrine\Tests\Models\Company\CompanyManager,
Doctrine\Tests\Models\Company\CompanyPerson,
Doctrine\Tests\Models\Company\CompanyCar;
/**

View File

@ -2,12 +2,10 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Tools\SchemaTool;
use Doctrine\ORM\Query;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsGroup;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsComment;

View File

@ -6,10 +6,8 @@ use Doctrine\Tests\Models\Company\CompanyPerson,
Doctrine\Tests\Models\Company\CompanyEmployee,
Doctrine\Tests\Models\Company\CompanyManager,
Doctrine\Tests\Models\Company\CompanyOrganization,
Doctrine\Tests\Models\Company\CompanyEvent,
Doctrine\Tests\Models\Company\CompanyAuction,
Doctrine\Tests\Models\Company\CompanyRaffle,
Doctrine\Tests\Models\Company\CompanyCar;
Doctrine\Tests\Models\Company\CompanyRaffle;
use Doctrine\Common\Collections\Criteria;

View File

@ -6,7 +6,6 @@ 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\ORM\UnitOfWork;
/**
* Description of DetachedEntityTest

View File

@ -5,7 +5,6 @@ namespace Doctrine\Tests\ORM\Functional;
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\Common\Collections\Criteria;
use Doctrine\Common\Collections\ArrayCollection;

View File

@ -1,4 +1,5 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\OrmFunctionalTestCase;
@ -17,7 +18,7 @@ class HydrationCacheTest extends OrmFunctionalTestCase
parent::setUp();
$user = new CmsUser;
$user = new CmsUser();
$user->name = "Benjamin";
$user->username = "beberlei";
$user->status = 'active';

View File

@ -2,15 +2,14 @@
namespace Doctrine\Tests\ORM\Functional\Locking;
use Doctrine\Tests\Models\CMS\CmsArticle,
Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\DBAL\LockMode,
Doctrine\ORM\EntityManager;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\DBAL\LockMode;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group locking_functional
*/
class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase
class GearmanLockTest extends OrmFunctionalTestCase
{
private $gearman = null;
private $maxRunTime = 0;

View File

@ -4,8 +4,7 @@ namespace Doctrine\Tests\ORM\Functional\Locking;
use Doctrine\Tests\Models\CMS\CmsArticle,
Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\DBAL\LockMode,
Doctrine\ORM\EntityManager;
Doctrine\DBAL\LockMode;
/**
* @group locking

View File

@ -2,15 +2,12 @@
namespace Doctrine\Tests\ORM\Functional\Locking;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\Common\EventManager;
use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\Tests\TestUtil;
use Doctrine\DBAL\LockMode;
use DateTime;
use Doctrine\Tests\OrmFunctionalTestCase;
class OptimisticTest extends \Doctrine\Tests\OrmFunctionalTestCase
class OptimisticTest extends OrmFunctionalTestCase
{
protected function setUp()
{

View File

@ -2,15 +2,14 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\OptimisticLockException;
use Doctrine\ORM\ORMException;
use Doctrine\Tests\Models\VersionedManyToOne\Article;
use Doctrine\Tests\Models\VersionedManyToOne\Category;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group MergeVersionedOneToMany
*/
class MergeVersionedManyToOneTest extends \Doctrine\Tests\OrmFunctionalTestCase
class MergeVersionedManyToOneTest extends OrmFunctionalTestCase
{
protected function setUp()
{

View File

@ -3,7 +3,6 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsAddress,
Doctrine\Tests\Models\CMS\CmsPhonenumber;
/**

View File

@ -4,8 +4,7 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsEmail,
Doctrine\Tests\Models\CMS\CmsAddress,
Doctrine\Tests\Models\CMS\CmsPhonenumber;
Doctrine\Tests\Models\CMS\CmsAddress;
/**
* Tests a bidirectional one-to-one association mapping with orphan removal.

View File

@ -2,10 +2,6 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
use Doctrine\ORM\Mapping\AssociationMapping;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Query;
use Doctrine\Tests\Models\OneToOneSingleTableInheritance\Cat;
use Doctrine\Tests\Models\OneToOneSingleTableInheritance\LitterBox;

View File

@ -2,8 +2,8 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Util\ClassUtils;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* Test that Doctrine ORM correctly works with proxy instances exactly like with ordinary Entities
@ -13,7 +13,7 @@ use Doctrine\Tests\Models\CMS\CmsUser;
* b) __initialized__ = false and identifier set in proxy and in property
* @todo All other cases would cause lazy loading
*/
class ProxiesLikeEntitiesTest extends \Doctrine\Tests\OrmFunctionalTestCase
class ProxiesLikeEntitiesTest extends OrmFunctionalTestCase
{
/**
* @var CmsUser

View File

@ -2,7 +2,6 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Common\Cache\ArrayCache;
/**

View File

@ -4,7 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\DBAL\Connection;
use Doctrine\Tests\Models\CMS\CmsUser,
Doctrine\Tests\Models\CMS\CmsArticle,
Doctrine\Tests\Models\CMS\CmsPhonenumber;

View File

@ -4,7 +4,7 @@ namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\ORM\Query\Filter\SQLFilter;
use Doctrine\ORM\Mapping\ClassMetaData;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\Common\Cache\ArrayCache;
use Doctrine\ORM\Mapping\ClassMetadataInfo;

View File

@ -10,7 +10,7 @@ class DBAL483Test extends \Doctrine\Tests\OrmFunctionalTestCase
{
parent::setUp();
$conn = $this->_em->getConnection();
$this->_em->getConnection();
$this->schemaTool = new Tools\SchemaTool($this->_em);
}

View File

@ -2,10 +2,10 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\ORM\Tools\SchemaTool,
Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Tools\SchemaTool;
use Doctrine\Tests\OrmFunctionalTestCase;
class MySqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
class MySqlSchemaToolTest extends OrmFunctionalTestCase
{
protected function setUp() {
parent::setUp();

View File

@ -2,8 +2,7 @@
namespace Doctrine\Tests\ORM\Functional\SchemaTool;
use Doctrine\ORM\Tools\SchemaTool,
Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Tools\SchemaTool;
class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
{

View File

@ -2,7 +2,6 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\ORM\Tools\SchemaValidator;
/**

View File

@ -2,10 +2,8 @@
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\Cache\Action;
use Doctrine\Tests\Models\Cache\Address;
use Doctrine\Tests\Models\Cache\Client;
use Doctrine\Tests\Models\Cache\ComplexAction;
use Doctrine\Tests\Models\Cache\Person;
use Doctrine\Tests\Models\Cache\Token;
use Doctrine\Tests\Models\Cache\Traveler;

View File

@ -2,14 +2,14 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1040
*/
class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1040Test extends OrmFunctionalTestCase
{
public function setUp()
{

View File

@ -2,12 +2,13 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\Company\CompanyFixContract;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1041
*/
class DDC1041Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1041Test extends OrmFunctionalTestCase
{
public function setUp()
{
@ -17,7 +18,7 @@ class DDC1041Test extends \Doctrine\Tests\OrmFunctionalTestCase
public function testGrabWrongSubtypeReturnsNull()
{
$fix = new \Doctrine\Tests\Models\Company\CompanyFixContract();
$fix = new CompanyFixContract();
$fix->setFixPrice(2000);
$this->_em->persist($fix);

View File

@ -2,12 +2,13 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1043
*/
class DDC1043Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1043Test extends OrmFunctionalTestCase
{
public function setUp()
{
@ -17,7 +18,7 @@ class DDC1043Test extends \Doctrine\Tests\OrmFunctionalTestCase
public function testChangeSetPlusWeirdPHPCastingIntCastingRule()
{
$user = new \Doctrine\Tests\Models\CMS\CmsUser();
$user = new CmsUser();
$user->name = "John Galt";
$user->username = "jgalt";
$user->status = "+44";

View File

@ -2,12 +2,13 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1050
*/
class DDC1050Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1050Test extends OrmFunctionalTestCase
{
public function setUp()
{
@ -21,7 +22,7 @@ class DDC1050Test extends \Doctrine\Tests\OrmFunctionalTestCase
public function testPerformance()
{
for ($i = 2; $i < 10000; ++$i) {
$user = new \Doctrine\Tests\Models\CMS\CmsUser();
$user = new CmsUser();
$user->status = 'developer';
$user->username = 'jwage'+$i;
$user->name = 'Jonathan';

View File

@ -2,10 +2,12 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\OrmFunctionalTestCase;
/**
* @group DDC-1080
*/
class DDC1080Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1080Test extends OrmFunctionalTestCase
{
public function testHydration()
{

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @group DDC-1113
* @group DDC-1306

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
/**
* @group DDC-1129
*/

View File

@ -2,7 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
class DDC1181Test extends \Doctrine\Tests\OrmFunctionalTestCase
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC1181Test extends OrmFunctionalTestCase
{
public function setUp()
{

View File

@ -1,9 +1,10 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use DateTime, Doctrine\DBAL\Types\Type;
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC1193Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1193Test extends OrmFunctionalTestCase
{
protected function setUp()
{

View File

@ -2,9 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC1209Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1209Test extends OrmFunctionalTestCase
{
protected function setUp()
{

View File

@ -2,9 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsEmployee;
/**
* @group DDC-1225
*/

View File

@ -2,9 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsEmployee;
/**
* @group DDC-1228
* @group DDC-1226

View File

@ -2,9 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsEmployee;
/**
* @group DDC-1238
*/

View File

@ -2,9 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsEmployee;
/**
* @group DDC-1250
*/

View File

@ -2,7 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsGroup;

View File

@ -2,9 +2,7 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsGroup;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
/**

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use DateTime;
/**
* @group DDC-1335
*/

View File

@ -15,7 +15,7 @@ class DDC1360Test extends OrmFunctionalTestCase
$this->markTestSkipped("PostgreSQL only test.");
}
$sql = $this->_schemaTool->getCreateSchemaSQL(array(
$sql = $this->_schemaTool->getCreateSchemaSql(array(
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote')
));

View File

@ -1,7 +1,6 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1383

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1400
*/

View File

@ -1,7 +1,6 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1436

View File

@ -2,7 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
class DDC144Test extends \Doctrine\Tests\OrmFunctionalTestCase
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC144Test extends OrmFunctionalTestCase
{
protected function setUp() {
parent::setUp();

View File

@ -3,7 +3,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1452

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1454
*/

View File

@ -2,11 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Tests\Models\CMS\CmsGroup;
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC1258Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1258Test extends OrmFunctionalTestCase
{
public function setUp()
{

View File

@ -2,10 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsUser;
/**
* @group DDC-1461
*/

View File

@ -2,8 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1509
*/

View File

@ -3,7 +3,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\UnitOfWork;
/**
* @group DDC-1514

View File

@ -2,9 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsComment;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsUser;

View File

@ -2,10 +2,6 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Tests\Models\CMS\CmsComment;
use Doctrine\Tests\Models\CMS\CmsArticle;
use Doctrine\Tests\Models\CMS\CmsUser;
/**

View File

@ -2,9 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\UnitOfWork;
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC1757Test extends \Doctrine\Tests\OrmFunctionalTestCase
class DDC1757Test extends OrmFunctionalTestCase
{
public function testFailingCase()
{

View File

@ -1,9 +1,7 @@
<?php
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Taxi\Car,
Doctrine\Tests\Models\Taxi\Driver,
Doctrine\Tests\Models\Taxi\Ride,
use Doctrine\Tests\Models\Taxi\Ride,
Doctrine\Tests\Models\Taxi\PaidRide;
/**

View File

@ -2,7 +2,9 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
class DDC192Test extends \Doctrine\Tests\OrmFunctionalTestCase
use Doctrine\Tests\OrmFunctionalTestCase;
class DDC192Test extends OrmFunctionalTestCase
{
public function testSchemaCreation()
{

Some files were not shown because too many files have changed in this diff Show More