doctrine / orm

tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php

Spacing +12 added lines, -12 removed lines

@@ -568,11 +568,11 @@ 
         $user = $this->_em->find(CmsUser::class, $this->userId);
 
         $this->assertFalse($user->articles->isInitialized());
-        $this->assertEquals(2, count($user->articles->slice(0,10)));
+        $this->assertEquals(2, count($user->articles->slice(0, 10)));
 
         $this->useCMSArticleTopicFilter();
 
-        $this->assertEquals(1, count($user->articles->slice(0,10)));
+        $this->assertEquals(1, count($user->articles->slice(0, 10)));
     }
 
     private function useCMSGroupPrefixFilter()
@@ -616,11 +616,11 @@ 
         $user = $this->_em->find(CmsUser::class, $this->userId2);
 
         $this->assertFalse($user->groups->isInitialized());
-        $this->assertEquals(2, count($user->groups->slice(0,10)));
+        $this->assertEquals(2, count($user->groups->slice(0, 10)));
 
         $this->useCMSGroupPrefixFilter();
 
-        $this->assertEquals(1, count($user->groups->slice(0,10)));
+        $this->assertEquals(1, count($user->groups->slice(0, 10)));
     }
 
     private function loadFixtureData()
@@ -1106,11 +1106,11 @@ 
 {
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
     {
-        if (!in_array("LocaleAware", $targetEntity->reflClass->getInterfaceNames())) {
+        if ( ! in_array("LocaleAware", $targetEntity->reflClass->getInterfaceNames())) {
             return "";
         }
 
-        return $targetTableAlias.'.locale = ' . $this->getParameter('locale'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.locale = '.$this->getParameter('locale'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1122,7 +1122,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.country = ' . $this->getParameter('country'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.country = '.$this->getParameter('country'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1134,7 +1134,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('prefix'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('prefix'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1146,7 +1146,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.topic = ' . $this->getParameter('topic'); // getParam uses connection to quote the value.
+        return $targetTableAlias.'.topic = '.$this->getParameter('topic'); // getParam uses connection to quote the value.
     }
 }
 
@@ -1158,7 +1158,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.name LIKE ' . $this->getParameter('name');
+        return $targetTableAlias.'.name LIKE '.$this->getParameter('name');
     }
 }
 
@@ -1170,7 +1170,7 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.completed = ' . $this->getParameter('completed');
+        return $targetTableAlias.'.completed = '.$this->getParameter('completed');
     }
 }
 
@@ -1182,6 +1182,6 @@ 
             return "";
         }
 
-        return $targetTableAlias.'.id = ' . $this->getParameter('id');
+        return $targetTableAlias.'.id = '.$this->getParameter('id');
     }
 }

tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php

Indentation +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
  * @DiscriminatorMap({"parent" = "CTIParent", "child" = "CTIChild"})
  */
 class CTIParent {
-   /**
+    /**
      * @Id @Column(type="integer")
      * @GeneratedValue(strategy="AUTO")
      */
@@ -111,7 +111,7 @@ 
  * @Entity @Table(name="cti_children")
  */
 class CTIChild extends CTIParent {
-   /**
+    /**
      * @Column(type="string")
      */
     private $data;

tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php

Indentation +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
 
     public function testMultiLevelUpdateAndFind()
     {
-    	$manager = new CompanyManager;
+        $manager = new CompanyManager;
         $manager->setName('Roman S. Borschel');
         $manager->setSalary(100000);
         $manager->setDepartment('IT');
@@ -143,7 +143,7 @@ 
 
     public function testSelfReferencingOneToOne()
     {
-    	$manager = new CompanyManager;
+        $manager = new CompanyManager;
         $manager->setName('John Smith');
         $manager->setSalary(100000);
         $manager->setDepartment('IT');
@@ -284,7 +284,7 @@ 
     public function testBulkUpdateIssueDDC368()
     {
         $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1')
-                  ->execute();
+                    ->execute();
 
         $result = $this->_em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1')
                             ->getResult();
@@ -298,9 +298,9 @@ 
     public function testBulkUpdateNonScalarParameterDDC1341()
     {
         $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1')
-                  ->setParameter(0, new \DateTime())
-                  ->setParameter(1, 'IT')
-                  ->execute();
+                    ->setParameter(0, new \DateTime())
+                    ->setParameter(1, 'IT')
+                    ->execute();
 
         $this->addToAssertionCount(1);
     }

Spacing +12 added lines, -12 removed lines

@@ -47,7 +47,7 @@ 
 
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select p from ' . CompanyPerson::class . ' p order by p.name desc');
+        $query = $this->_em->createQuery('select p from '.CompanyPerson::class.' p order by p.name desc');
 
         $entities = $query->getResult();
 
@@ -62,7 +62,7 @@ 
 
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select p from ' . CompanyEmployee::class . ' p');
+        $query = $this->_em->createQuery('select p from '.CompanyEmployee::class.' p');
 
         $entities = $query->getResult();
 
@@ -80,7 +80,7 @@ 
 
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("update " . CompanyEmployee::class . " p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
+        $query = $this->_em->createQuery("update ".CompanyEmployee::class." p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3");
         $query->setParameter(1, 'NewName', 'string');
         $query->setParameter(2, 'NewDepartment');
         $query->setParameter(3, 100000);
@@ -88,7 +88,7 @@ 
         $numUpdated = $query->execute();
         $this->assertEquals(1, $numUpdated);
 
-        $query = $this->_em->createQuery('delete from ' . CompanyPerson::class . ' p');
+        $query = $this->_em->createQuery('delete from '.CompanyPerson::class.' p');
         $numDeleted = $query->execute();
         $this->assertEquals(2, $numDeleted);
     }
@@ -161,7 +161,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select p, s from ' . CompanyPerson::class . ' p join p.spouse s where p.name=\'Mary Smith\'');
+        $query = $this->_em->createQuery('select p, s from '.CompanyPerson::class.' p join p.spouse s where p.name=\'Mary Smith\'');
 
         $result = $query->getResult();
         $this->assertCount(1, $result);
@@ -193,7 +193,7 @@ 
 
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select p, f from ' . CompanyPerson::class . ' p join p.friends f where p.name=?1');
+        $query = $this->_em->createQuery('select p, f from '.CompanyPerson::class.' p join p.friends f where p.name=?1');
         $query->setParameter(1, 'Roman');
 
         $result = $query->getResult();
@@ -255,7 +255,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $q = $this->_em->createQuery('select a from ' . CompanyEvent::class . ' a where a.id = ?1');
+        $q = $this->_em->createQuery('select a from '.CompanyEvent::class.' a where a.id = ?1');
         $q->setParameter(1, $event1->getId());
 
         $result = $q->getResult();
@@ -264,7 +264,7 @@ 
 
         $this->_em->clear();
 
-        $q = $this->_em->createQuery('select a from ' . CompanyOrganization::class . ' a where a.id = ?1');
+        $q = $this->_em->createQuery('select a from '.CompanyOrganization::class.' a where a.id = ?1');
         $q->setParameter(1, $org->getId());
 
         $result = $q->getResult();
@@ -283,10 +283,10 @@ 
      */
     public function testBulkUpdateIssueDDC368()
     {
-        $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1')
+        $this->_em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.salary = 1')
                   ->execute();
 
-        $result = $this->_em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1')
+        $result = $this->_em->createQuery('SELECT count(p.id) FROM '.CompanyEmployee::class.' p WHERE p.salary = 1')
                             ->getResult();
 
         $this->assertGreaterThan(0, count($result));
@@ -297,7 +297,7 @@ 
      */
     public function testBulkUpdateNonScalarParameterDDC1341()
     {
-        $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1')
+        $this->_em->createQuery('UPDATE '.CompanyEmployee::class.' AS p SET p.startDate = ?0 WHERE p.department = ?1')
                   ->setParameter(0, new \DateTime())
                   ->setParameter(1, 'IT')
                   ->execute();
@@ -355,7 +355,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dqlManager = $this->_em->createQuery('SELECT m FROM ' . CompanyManager::class . ' m WHERE m.spouse = ?1')
+        $dqlManager = $this->_em->createQuery('SELECT m FROM '.CompanyManager::class.' m WHERE m.spouse = ?1')
                                 ->setParameter(1, $person->getId())
                                 ->getSingleResult();
 

tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php

Spacing +4 added lines, -4 removed lines

@@ -197,7 +197,7 @@ 
     {
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postFlush => function(){
+                Events::postFlush => function() {
             throw new \RuntimeException('post flush failure');
         }
             ]
@@ -231,7 +231,7 @@ 
 
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postUpdate => function(){
+                Events::postUpdate => function() {
             throw new \RuntimeException('post update failure');
         }
             ]
@@ -250,7 +250,7 @@ 
         $this->assertInstanceOf(State::class, $state);
         $this->assertEquals($stateName, $state->getName());
 
-        $state->setName($stateName . uniqid());
+        $state->setName($stateName.uniqid());
 
         $this->_em->persist($state);
 
@@ -279,7 +279,7 @@ 
 
         $listener = new ListenerSecondLevelCacheTest(
             [
-                Events::postRemove => function(){
+                Events::postRemove => function() {
             throw new \RuntimeException('post remove failure');
         }
             ]

tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php

Indentation +11 added lines, -11 removed lines

@@ -25,8 +25,8 @@ 
     public function testAggregateWithHavingClause()
     {
         $dql = 'SELECT p.department, AVG(p.salary) AS avgSalary '.
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -40,8 +40,8 @@ 
     public function testUnnamedScalarResultsAreOneBased()
     {
         $dql = 'SELECT p.department, AVG(p.salary) '.
-               'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
+                'FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
+                'GROUP BY p.department HAVING SUM(p.salary) > 200000 ORDER BY p.department';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -53,9 +53,9 @@ 
     public function testOrderByResultVariableCollectionSize()
     {
         $dql = 'SELECT p.name, size(p.friends) AS friends ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.friends IS NOT EMPTY ' .
-               'ORDER BY friends DESC, p.name DESC';
+                'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
+                'WHERE p.friends IS NOT EMPTY ' .
+                'ORDER BY friends DESC, p.name DESC';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
@@ -77,7 +77,7 @@ 
     public function testIsNullAssociation()
     {
         $dql = 'SELECT p FROM Doctrine\Tests\Models\Company\CompanyPerson p '.
-               'WHERE p.spouse IS NULL';
+                'WHERE p.spouse IS NULL';
         $result = $this->_em->createQuery($dql)->getResult();
 
         $this->assertEquals(2, count($result));
@@ -91,7 +91,7 @@ 
     public function testSelectSubselect()
     {
         $dql = 'SELECT p, (SELECT c.brand FROM Doctrine\Tests\Models\Company\CompanyCar c WHERE p.car = c) brandName '.
-               'FROM Doctrine\Tests\Models\Company\CompanyManager p';
+                'FROM Doctrine\Tests\Models\Company\CompanyManager p';
         $result = $this->_em->createQuery($dql)->getArrayResult();
 
         $this->assertEquals(1, count($result));
@@ -101,7 +101,7 @@ 
     public function testInSubselect()
     {
         $dql = "SELECT p.name FROM Doctrine\Tests\Models\Company\CompanyPerson p ".
-               "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
+                "WHERE p.name IN (SELECT n.name FROM Doctrine\Tests\Models\Company\CompanyPerson n WHERE n.name = 'Roman B.')";
         $result = $this->_em->createQuery($dql)->getScalarResult();
 
         $this->assertEquals(1, count($result));
@@ -111,7 +111,7 @@ 
     public function testGroupByMultipleFields()
     {
         $dql = 'SELECT p.department, p.name, count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p '.
-               'GROUP BY p.department, p.name';
+                'GROUP BY p.department, p.name';
         $result = $this->_em->createQuery($dql)->getResult();
 
         $this->assertEquals(4, count($result));

Spacing +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@
 
     public function testOrderByResultVariableCollectionSize()
     {
-        $dql = 'SELECT p.name, size(p.friends) AS friends ' .
-               'FROM Doctrine\Tests\Models\Company\CompanyPerson p ' .
-               'WHERE p.friends IS NOT EMPTY ' .
+        $dql = 'SELECT p.name, size(p.friends) AS friends '.
+               'FROM Doctrine\Tests\Models\Company\CompanyPerson p '.
+               'WHERE p.friends IS NOT EMPTY '.
                'ORDER BY friends DESC, p.name DESC';
 
         $result = $this->_em->createQuery($dql)->getScalarResult();

tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         try {
             // exception depending on the underlying Database Driver
             $this->_em->flush();
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             $exceptionThrown = true;
         }
 

tests/Doctrine/Tests/ORM/Functional/EntityListenersTest.php

Spacing +11 added lines, -11 removed lines

@@ -35,12 +35,12 @@ 
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->preFlushCalls  = [];
+        $this->listener->preFlushCalls = [];
 
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->preFlushCalls);
+        $this->assertCount(1, $this->listener->preFlushCalls);
         $this->assertSame($fix, $this->listener->preFlushCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preFlushCalls[0][0]);
         $this->assertInstanceOf(PreFlushEventArgs::class, $this->listener->preFlushCalls[0][1]);
@@ -55,12 +55,12 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $this->listener->postLoadCalls  = [];
+        $this->listener->postLoadCalls = [];
 
         $dql = "SELECT f FROM Doctrine\Tests\Models\Company\CompanyFixContract f WHERE f.id = ?1";
         $fix = $this->_em->createQuery($dql)->setParameter(1, $fix->getId())->getSingleResult();
 
-        $this->assertCount(1,$this->listener->postLoadCalls);
+        $this->assertCount(1, $this->listener->postLoadCalls);
         $this->assertSame($fix, $this->listener->postLoadCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postLoadCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postLoadCalls[0][1]);
@@ -71,12 +71,12 @@ 
         $fix = new CompanyFixContract();
         $fix->setFixPrice(2000);
 
-        $this->listener->prePersistCalls  = [];
+        $this->listener->prePersistCalls = [];
 
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->prePersistCalls);
+        $this->assertCount(1, $this->listener->prePersistCalls);
         $this->assertSame($fix, $this->listener->prePersistCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->prePersistCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->prePersistCalls[0][1]);
@@ -92,7 +92,7 @@ 
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->postPersistCalls);
+        $this->assertCount(1, $this->listener->postPersistCalls);
         $this->assertSame($fix, $this->listener->postPersistCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postPersistCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postPersistCalls[0][1]);
@@ -113,7 +113,7 @@ 
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->preUpdateCalls);
+        $this->assertCount(1, $this->listener->preUpdateCalls);
         $this->assertSame($fix, $this->listener->preUpdateCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preUpdateCalls[0][0]);
         $this->assertInstanceOf(PreUpdateEventArgs::class, $this->listener->preUpdateCalls[0][1]);
@@ -134,7 +134,7 @@ 
         $this->_em->persist($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->postUpdateCalls);
+        $this->assertCount(1, $this->listener->postUpdateCalls);
         $this->assertSame($fix, $this->listener->postUpdateCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postUpdateCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postUpdateCalls[0][1]);
@@ -153,7 +153,7 @@ 
         $this->_em->remove($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->preRemoveCalls);
+        $this->assertCount(1, $this->listener->preRemoveCalls);
         $this->assertSame($fix, $this->listener->preRemoveCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->preRemoveCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->preRemoveCalls[0][1]);
@@ -172,7 +172,7 @@ 
         $this->_em->remove($fix);
         $this->_em->flush();
 
-        $this->assertCount(1,$this->listener->postRemoveCalls);
+        $this->assertCount(1, $this->listener->postRemoveCalls);
         $this->assertSame($fix, $this->listener->postRemoveCalls[0][0]);
         $this->assertInstanceOf(CompanyFixContract::class, $this->listener->postRemoveCalls[0][0]);
         $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->postRemoveCalls[0][1]);

tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php

Indentation +170 added lines, -170 removed lines

@@ -131,65 +131,65 @@ 
  */
 class Lemma {
 
-	const CLASS_NAME = __CLASS__;
-
-	/**
-	 * @var int
-	 * @Id
-	 * @Column(type="integer", name="lemma_id")
-	 * @GeneratedValue(strategy="AUTO")
-	 */
-	private $id;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="lemma_name", unique=true, length=255)
-	 */
-	private $lemma;
-
-	/**
-	 * @var kateglo\application\utilities\collections\ArrayCollection
-	 * @ManyToMany(targetEntity="Type", mappedBy="lemmas", cascade={"persist"})
-	 */
-	private $types;
-
-	public function __construct() {
-		$this->types = new ArrayCollection();
-	}
-
-
-	/**
-	 *
-	 * @return int
-	 */
-	public function getId(){
-		return $this->id;
-	}
-
-	/**
-	 *
-	 * @param string $lemma
-	 * @return void
-	 */
-	public function setLemma($lemma){
-		$this->lemma = $lemma;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getLemma(){
-		return $this->lemma;
-	}
-
-	/**
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     * @var int
+     * @Id
+     * @Column(type="integer", name="lemma_id")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="lemma_name", unique=true, length=255)
+     */
+    private $lemma;
+
+    /**
+     * @var kateglo\application\utilities\collections\ArrayCollection
+     * @ManyToMany(targetEntity="Type", mappedBy="lemmas", cascade={"persist"})
+     */
+    private $types;
+
+    public function __construct() {
+        $this->types = new ArrayCollection();
+    }
+
+
+    /**
+     *
+     * @return int
+     */
+    public function getId(){
+        return $this->id;
+    }
+
+    /**
+     *
+     * @param string $lemma
+     * @return void
+     */
+    public function setLemma($lemma){
+        $this->lemma = $lemma;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getLemma(){
+        return $this->lemma;
+    }
+
+    /**
      *
      * @param kateglo\application\models\Type $type
      * @return void
      */
-	public function addType(Type $type){
+    public function addType(Type $type){
         if (!$this->types->contains($type)) {
             $this->types[] = $type;
             $type->addLemma($this);
@@ -225,121 +225,121 @@ 
  */
 class Type {
 
-	const CLASS_NAME = __CLASS__;
-
-	/**
-	 *
-	 * @var int
-	 * @Id
-	 * @Column(type="integer", name="type_id")
-	 * @GeneratedValue(strategy="AUTO")
-	 */
-	private $id;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="type_name", unique=true)
-	 */
-	private $type;
-
-	/**
-	 *
-	 * @var string
-	 * @Column(type="string", name="type_abbreviation", unique=true)
-	 */
-	private $abbreviation;
-
-	/**
-	 * @var kateglo\application\helpers\collections\ArrayCollection
-	 * @ManyToMany(targetEntity="Lemma")
-	 * @JoinTable(name="lemma_type",
-	 * 		joinColumns={@JoinColumn(name="type_id", referencedColumnName="type_id")},
-	 * 		inverseJoinColumns={@JoinColumn(name="lemma_id", referencedColumnName="lemma_id")}
-	 * )
-	 */
-	private $lemmas;
-
-	public function __construct(){
-		$this->lemmas = new ArrayCollection();
-	}
-
-	/**
-	 *
-	 * @return int
-	 */
-	public function getId(){
-		return $this->id;
-	}
-
-	/**
-	 *
-	 * @param string $type
-	 * @return void
-	 */
-	public function setType($type){
-		$this->type = $type;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getType(){
-		return $this->type;
-	}
-
-	/**
-	 *
-	 * @param string $abbreviation
-	 * @return void
-	 */
-	public function setAbbreviation($abbreviation){
-		$this->abbreviation = $abbreviation;
-	}
-
-	/**
-	 *
-	 * @return string
-	 */
-	public function getAbbreviation(){
-		return $this->abbreviation;
-	}
-
-	/**
-	 *
-	 * @param kateglo\application\models\Lemma $lemma
-	 * @return void
-	 */
-	public function addLemma(Lemma $lemma)
-	{
-		if (!$this->lemmas->contains($lemma)) {
-			$this->lemmas[] = $lemma;
-			$lemma->addType($this);
-		}
-	}
-
-	/**
-	 *
-	 * @param kateglo\application\models\Lemma $lemma
-	 * @return void
-	 */
-	public function removeLEmma(Lemma $lemma)
-	{
-		$removed = $this->lemmas->removeElement($lemma);
-		if ($removed !== null) {
-			$removed->removeType($this);
-		}
-	}
-
-	/**
-	 *
-	 * @return kateglo\application\helpers\collections\ArrayCollection
-	 */
-	public function getCategories()
-	{
-		return $this->categories;
-	}
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     *
+     * @var int
+     * @Id
+     * @Column(type="integer", name="type_id")
+     * @GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="type_name", unique=true)
+     */
+    private $type;
+
+    /**
+     *
+     * @var string
+     * @Column(type="string", name="type_abbreviation", unique=true)
+     */
+    private $abbreviation;
+
+    /**
+     * @var kateglo\application\helpers\collections\ArrayCollection
+     * @ManyToMany(targetEntity="Lemma")
+     * @JoinTable(name="lemma_type",
+     * 		joinColumns={@JoinColumn(name="type_id", referencedColumnName="type_id")},
+     * 		inverseJoinColumns={@JoinColumn(name="lemma_id", referencedColumnName="lemma_id")}
+     * )
+     */
+    private $lemmas;
+
+    public function __construct(){
+        $this->lemmas = new ArrayCollection();
+    }
+
+    /**
+     *
+     * @return int
+     */
+    public function getId(){
+        return $this->id;
+    }
+
+    /**
+     *
+     * @param string $type
+     * @return void
+     */
+    public function setType($type){
+        $this->type = $type;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getType(){
+        return $this->type;
+    }
+
+    /**
+     *
+     * @param string $abbreviation
+     * @return void
+     */
+    public function setAbbreviation($abbreviation){
+        $this->abbreviation = $abbreviation;
+    }
+
+    /**
+     *
+     * @return string
+     */
+    public function getAbbreviation(){
+        return $this->abbreviation;
+    }
+
+    /**
+     *
+     * @param kateglo\application\models\Lemma $lemma
+     * @return void
+     */
+    public function addLemma(Lemma $lemma)
+    {
+        if (!$this->lemmas->contains($lemma)) {
+            $this->lemmas[] = $lemma;
+            $lemma->addType($this);
+        }
+    }
+
+    /**
+     *
+     * @param kateglo\application\models\Lemma $lemma
+     * @return void
+     */
+    public function removeLEmma(Lemma $lemma)
+    {
+        $removed = $this->lemmas->removeElement($lemma);
+        if ($removed !== null) {
+            $removed->removeType($this);
+        }
+    }
+
+    /**
+     *
+     * @return kateglo\application\helpers\collections\ArrayCollection
+     */
+    public function getCategories()
+    {
+        return $this->categories;
+    }
 
 }
 

Spacing +31 added lines, -31 removed lines

@@ -163,7 +163,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -172,7 +172,7 @@ 
 	 * @param string $lemma
 	 * @return void
 	 */
-	public function setLemma($lemma){
+	public function setLemma($lemma) {
 		$this->lemma = $lemma;
 	}
 
@@ -180,7 +180,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getLemma(){
+	public function getLemma() {
 		return $this->lemma;
 	}
 
@@ -189,8 +189,8 @@ 
      * @param kateglo\application\models\Type $type
      * @return void
      */
-	public function addType(Type $type){
-        if (!$this->types->contains($type)) {
+	public function addType(Type $type) {
+        if ( ! $this->types->contains($type)) {
             $this->types[] = $type;
             $type->addLemma($this);
         }
@@ -260,7 +260,7 @@ 
 	 */
 	private $lemmas;
 
-	public function __construct(){
+	public function __construct() {
 		$this->lemmas = new ArrayCollection();
 	}
 
@@ -268,7 +268,7 @@ 
 	 *
 	 * @return int
 	 */
-	public function getId(){
+	public function getId() {
 		return $this->id;
 	}
 
@@ -277,7 +277,7 @@ 
 	 * @param string $type
 	 * @return void
 	 */
-	public function setType($type){
+	public function setType($type) {
 		$this->type = $type;
 	}
 
@@ -285,7 +285,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getType(){
+	public function getType() {
 		return $this->type;
 	}
 
@@ -294,7 +294,7 @@ 
 	 * @param string $abbreviation
 	 * @return void
 	 */
-	public function setAbbreviation($abbreviation){
+	public function setAbbreviation($abbreviation) {
 		$this->abbreviation = $abbreviation;
 	}
 
@@ -302,7 +302,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAbbreviation(){
+	public function getAbbreviation() {
 		return $this->abbreviation;
 	}
 
@@ -313,7 +313,7 @@ 
 	 */
 	public function addLemma(Lemma $lemma)
 	{
-		if (!$this->lemmas->contains($lemma)) {
+		if ( ! $this->lemmas->contains($lemma)) {
 			$this->lemmas[] = $lemma;
 			$lemma->addType($this);
 		}
@@ -384,7 +384,7 @@ 
      * @param Definition $definition
      * @return void
      */
-    public function addDefinition(Definition $definition){
+    public function addDefinition(Definition $definition) {
         $this->definitions[] = $definition;
         $definition->setPhrase($this);
     }
@@ -392,7 +392,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -400,14 +400,14 @@ 
      * @param string $phrase
      * @return void
      */
-    public function setPhrase($phrase){
+    public function setPhrase($phrase) {
         $this->phrase = $phrase;
     }
 
     /**
      * @return string
      */
-    public function getPhrase(){
+    public function getPhrase() {
         return $this->phrase;
     }
 
@@ -416,7 +416,7 @@ 
      * @param PhraseType $type
      * @return void
      */
-    public function setType(PhraseType $type){
+    public function setType(PhraseType $type) {
         $this->type = $type;
     }
 
@@ -424,7 +424,7 @@ 
      *
      * @return PhraseType
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
 
@@ -432,7 +432,7 @@ 
      *
      * @return ArrayCollection
      */
-    public function getDefinitions(){
+    public function getDefinitions() {
         return $this->definitions;
     }
 }
@@ -474,7 +474,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -482,14 +482,14 @@ 
      * @param string $type
      * @return void
      */
-    public function setType($type){
+    public function setType($type) {
         $this->type = $type;
     }
 
     /**
      * @return string
      */
-    public function getType(){
+    public function getType() {
         return $this->type;
     }
 
@@ -497,14 +497,14 @@ 
      * @param string $abbreviation
      * @return void
      */
-    public function setAbbreviation($abbreviation){
+    public function setAbbreviation($abbreviation) {
         $this->abbreviation = $abbreviation;
     }
 
     /**
      * @return string
      */
-    public function getAbbreviation(){
+    public function getAbbreviation() {
         return $this->abbreviation;
     }
 
@@ -512,7 +512,7 @@ 
      * @param ArrayCollection $phrases
      * @return void
      */
-    public function setPhrases($phrases){
+    public function setPhrases($phrases) {
         $this->phrases = $phrases;
     }
 
@@ -520,7 +520,7 @@ 
      *
      * @return ArrayCollection
      */
-    public function getPhrases(){
+    public function getPhrases() {
         return $this->phrases;
     }
 
@@ -555,7 +555,7 @@ 
     /**
      * @return int
      */
-    public function getId(){
+    public function getId() {
         return $this->id;
     }
 
@@ -563,14 +563,14 @@ 
      * @param Phrase $phrase
      * @return void
      */
-    public function setPhrase(Phrase $phrase){
+    public function setPhrase(Phrase $phrase) {
         $this->phrase = $phrase;
     }
 
     /**
      * @return Phrase
      */
-    public function getPhrase(){
+    public function getPhrase() {
         return $this->phrase;
     }
 
@@ -587,14 +587,14 @@ 
      * @param string $definition
      * @return void
      */
-    public function setDefinition($definition){
+    public function setDefinition($definition) {
         $this->definition = $definition;
     }
 
     /**
      * @return string
      */
-    public function getDefinition(){
+    public function getDefinition() {
         return $this->definition;
     }
 }

tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php

Indentation +3 added lines, -3 removed lines

@@ -109,7 +109,7 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t, p, c FROM Doctrine\Tests\Models\Navigation\NavTour t ' .
-               'INNER JOIN t.pois p INNER JOIN p.country c';
+                'INNER JOIN t.pois p INNER JOIN p.country c';
         $tours = $this->_em->createQuery($dql)->getResult();
 
         $this->assertEquals(1, count($tours));
@@ -128,9 +128,9 @@ 
         $this->putTripAroundEurope();
 
         $dql = 'SELECT t FROM Doctrine\Tests\Models\Navigation\NavTour t, Doctrine\Tests\Models\Navigation\NavPointOfInterest p ' .
-               'WHERE p MEMBER OF t.pois';
+                'WHERE p MEMBER OF t.pois';
         $tours = $this->_em->createQuery($dql)
-                           ->getResult();
+                            ->getResult();
 
         $this->assertEquals(1, count($tours));
     }

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
         $this->putGermanysBrandenburderTor();
         $this->putTripAroundEurope();
 
-        $dql = 'SELECT t, p, c FROM Doctrine\Tests\Models\Navigation\NavTour t ' .
+        $dql = 'SELECT t, p, c FROM Doctrine\Tests\Models\Navigation\NavTour t '.
                'INNER JOIN t.pois p INNER JOIN p.country c';
         $tours = $this->_em->createQuery($dql)->getResult();
 
@@ -127,7 +127,7 @@ 
         $this->putGermanysBrandenburderTor();
         $this->putTripAroundEurope();
 
-        $dql = 'SELECT t FROM Doctrine\Tests\Models\Navigation\NavTour t, Doctrine\Tests\Models\Navigation\NavPointOfInterest p ' .
+        $dql = 'SELECT t FROM Doctrine\Tests\Models\Navigation\NavTour t, Doctrine\Tests\Models\Navigation\NavPointOfInterest p '.
                'WHERE p MEMBER OF t.pois';
         $tours = $this->_em->createQuery($dql)
                            ->getResult();