Remove full qualified class names in tests

doctrine · May 10, 2016 · b173763 · b173763
1 parent bf322b9
commit b173763
Show file tree

Hide file tree

Showing 95 changed files with 417 additions and 290 deletions.
diff --git a/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php b/tests/Doctrine/Tests/EventListener/CacheMetadataListener.php
@@ -40,15 +40,15 @@ public function loadClassMetadata(LoadClassMetadataEventArgs $event)
      *
      * @return bool
      */
-    private function isVisited(ClassMetaData $metadata)
+    private function isVisited(ClassMetadata $metadata)
     {
         return isset($this->enabledItems[$metadata->getName()]);
     }
 
     /**
      * @param ClassMetadata $metadata
      */
-    private function recordVisit(ClassMetaData $metadata)
+    private function recordVisit(ClassMetadata $metadata)
     {
         $this->enabledItems[$metadata->getName()] = true;
     }

diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php
@@ -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")
      */

diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php
@@ -10,7 +10,7 @@ class DDC3293User
     protected $id;
 
     /**
-     * @var Doctrine\Tests\Models\DDC3293\DDC3293Address
+     * @var \Doctrine\Tests\Models\DDC3293\DDC3293Address
      */
     protected $address;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php
@@ -10,7 +10,7 @@ class DDC3293UserPrefixed
     protected $id;
 
     /**
-     * @var Doctrine\Tests\Models\DDC3293\DDC3293Address
+     * @var \Doctrine\Tests\Models\DDC3293\DDC3293Address
      */
     protected $address;
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
@@ -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;

diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
@@ -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;
     }
 
     /**

diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php
@@ -5,13 +5,14 @@
 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()
     {

diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
@@ -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 @@ public function testBasicUnitsOfWorkWithOneToManyAssociation()
         $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,26 +151,26 @@ public function testRemove()
         $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();
         $id = $user->getId();
 
         $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 @@ public function testTextColumnSaveAndRetrieve()
 
         $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 @@ public function testFlushDoesNotIssueUnnecessaryUpdates()
         $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 @@ public function testFlushDoesNotIssueUnnecessaryUpdates()
         $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 @@ public function testMergeThrowsExceptionIfEntityWithGeneratedIdentifierDoesNotEx
         try {
             $this->_em->merge($user);
             $this->fail();
-        } catch (\Doctrine\ORM\EntityNotFoundException $enfe) {}
+        } catch (EntityNotFoundException $enfe) {}
     }
 
     /**
@@ -995,7 +1000,7 @@ public function testManyToOneFetchModeQuery()
         $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 @@ public function testClearWithEntityName()
 
         $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()

diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php
@@ -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()
     {

diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php
@@ -10,15 +10,17 @@
     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 @@ public function testCRUD()
         $query->setParameter(1, 'NewName', 'string');
         $query->setParameter(2, 'NewDepartment');
         $query->setParameter(3, 100000);
-        $query->getSql();
+        $query->getSQL();
         $numUpdated = $query->execute();
         $this->assertEquals(1, $numUpdated);
 

diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
@@ -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;
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php b/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php
@@ -4,18 +4,15 @@
 
 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;

diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
@@ -6,8 +6,9 @@
 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()
     {

diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyWithAssociationsTest.php
@@ -5,8 +5,9 @@
 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()
     {