doctrine / orm

tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php

Doc Comments +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
 
     /**
      *
-     * @return Phrase
+     * @return Lemma
      */
     public function getParent() {
         return $this->parent;

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         $this->assertInstanceOf(Lemma::class, $lemma);
         $relations = $lemma->getRelations();
 
-        foreach($relations as $relation) {
+        foreach ($relations as $relation) {
             $this->assertInstanceOf(Relation::class, $relation);
             $this->assertTrue($relation->getType()->getType() != '');
         }

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

Doc Comments +11 added lines

@@ -339,6 +339,9 @@ 
     /** @Embedded(class = "DDC93Timestamps") */
     public $timestamps;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name = null, DDC93Address $address = null)
     {
         $this->name = $name;
@@ -403,6 +406,9 @@ 
      */
     public $name;
 
+    /**
+     * @param string $name
+     */
     public function __construct($name = null)
     {
         $this->name = $name;
@@ -431,6 +437,11 @@ 
     /** @Embedded(class = "DDC93Country") */
     public $country;
 
+    /**
+     * @param string $street
+     * @param string $zip
+     * @param string $city
+     */
     public function __construct($street = null, $zip = null, $city = null, DDC93Country $country = null)
     {
         $this->street = $street;

Spacing +15 added lines, -15 removed lines

@@ -27,7 +27,7 @@ 
                 $this->_em->getClassMetadata(DDC3027Dog::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -82,7 +82,7 @@ 
         $this->assertEquals('United States of America', $person->address->country->name);
 
         // 4. check deleting works
-        $personId = $person->id;;
+        $personId = $person->id; ;
         $this->_em->remove($person);
         $this->_em->flush();
 
@@ -106,7 +106,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getResult();
 
         $this->assertCount(3, $persons);
@@ -119,7 +119,7 @@ 
             $this->assertEquals('United States of America', $person->address->country->name);
         }
 
-        $dql = "SELECT p FROM " . __NAMESPACE__ . "\DDC93Person p";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\DDC93Person p";
         $persons = $this->_em->createQuery($dql)->getArrayResult();
 
         foreach ($persons as $person) {
@@ -144,7 +144,7 @@ 
         $this->_em->flush($person);
 
         // SELECT
-        $selectDql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
+        $selectDql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country";
         $loadedPerson = $this->_em->createQuery($selectDql)
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'Germany')
@@ -159,7 +159,7 @@ 
         );
 
         // UPDATE
-        $updateDql = "UPDATE " . __NAMESPACE__ . "\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
+        $updateDql = "UPDATE ".__NAMESPACE__."\\DDC93Person p SET p.address.street = :street, p.address.country.name = :country WHERE p.address.city = :city";
         $this->_em->createQuery($updateDql)
             ->setParameter('street', 'Boo')
             ->setParameter('country', 'DE')
@@ -171,7 +171,7 @@ 
         $this->assertEquals('DE', $person->address->country->name);
 
         // DELETE
-        $this->_em->createQuery("DELETE " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
+        $this->_em->createQuery("DELETE ".__NAMESPACE__."\\DDC93Person p WHERE p.address.city = :city AND p.address.country.name = :country")
             ->setParameter('city', 'Karlsruhe')
             ->setParameter('country', 'DE')
             ->execute();
@@ -188,7 +188,7 @@ 
         $this->_em->clear();
 
         // Prove that the entity was persisted correctly.
-        $dql = "SELECT p FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -202,7 +202,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{id,address.city} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{id,address.city} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -218,7 +218,7 @@ 
         // Clear the EM and prove that the embeddable can be the subject of a partial query regardless of attributes positions.
         $this->_em->clear();
 
-        $dql = "SELECT PARTIAL p.{address.city, id} FROM " . __NAMESPACE__ ."\\DDC93Person p WHERE p.name = :name";
+        $dql = "SELECT PARTIAL p.{address.city, id} FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.name = :name";
 
         $person = $this->_em->createQuery($dql)
             ->setParameter('name', 'Karl')
@@ -237,7 +237,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('no field or association named address.asdfasdf');
 
-        $this->_em->createQuery("SELECT p FROM " . __NAMESPACE__ . "\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
+        $this->_em->createQuery("SELECT p FROM ".__NAMESPACE__."\\DDC93Person p WHERE p.address.asdfasdf IS NULL")
             ->execute();
     }
 
@@ -246,7 +246,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage("no mapped field named 'address.asdfasdf'");
 
-        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM " . __NAMESPACE__ . "\\DDC93Person p")
+        $this->_em->createQuery("SELECT PARTIAL p.{id,address.asdfasdf} FROM ".__NAMESPACE__."\\DDC93Person p")
             ->execute();
     }
 
@@ -308,15 +308,15 @@ 
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
             sprintf(
-                'Infinite nesting detected for embedded property %s::nested. ' .
+                'Infinite nesting detected for embedded property %s::nested. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
-                __NAMESPACE__ . '\\' . $declaredEmbeddableClassName
+                __NAMESPACE__.'\\'.$declaredEmbeddableClassName
             )
         );
 
         $this->_schemaTool->createSchema(
             [
-            $this->_em->getClassMetadata(__NAMESPACE__ . '\\' . $embeddableClassName),
+            $this->_em->getClassMetadata(__NAMESPACE__.'\\'.$embeddableClassName),
             ]
         );
     }

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

Doc Comments +12 added lines

@@ -124,6 +124,9 @@ 
         $this->assertEquals(503, $this->countQuery($em));
     }
 
+    /**
+     * @param string $label
+     */
     private function queryEntity(EntityManagerInterface $em, $label)
     {
         $times        = 100;
@@ -155,6 +158,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     public function findEntityOneToMany(EntityManagerInterface $em, $label)
     {
         $times        = 50;
@@ -214,6 +220,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     private function findEntity(EntityManagerInterface $em, $label)
     {
         $times        = 10;
@@ -249,6 +258,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     private function findAllEntity(EntityManagerInterface $em, $label)
     {
         $times        = 100;

Spacing +8 added lines, -8 removed lines

@@ -130,7 +130,7 @@ 
         $size         = 500;
         $startPersist = microtime(true);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $em->persist(new Country("Country $i"));
@@ -164,7 +164,7 @@ 
         $startPersist = microtime(true);
         $country      = new Country("Country");
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         $em->persist($country);
         $em->flush();
@@ -194,9 +194,9 @@ 
         $em->flush();
         $em->clear();
 
-        printf("\n[%s] persist %s states and %s cities", number_format( microtime(true) - $startPersist, 6), count($states), count($cities));
+        printf("\n[%s] persist %s states and %s cities", number_format(microtime(true) - $startPersist, 6), count($states), count($cities));
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i < $times; $i++) {
 
@@ -221,7 +221,7 @@ 
         $countries    = [];
         $startPersist = microtime(true);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $country = new Country("Country $i");
@@ -236,7 +236,7 @@ 
 
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i <= $times; $i++) {
             foreach ($countries as $country) {
@@ -256,7 +256,7 @@ 
         $startPersist = microtime(true);
         $rep          = $em->getRepository(Country::class);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $em->persist(new Country("Country $i"));
@@ -267,7 +267,7 @@ 
 
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i <= $times; $i++) {
             $list = $rep->findAll();

tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php

Doc Comments +4 added lines

@@ -43,6 +43,10 @@
         $this->_em = $this->_getTestEntityManager();
     }
 
+    /**
+     * @param string $dqlToBeTested
+     * @param string $sqlToBeConfirmed
+     */
     public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed)
     {
         try {

tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php

Doc Comments +6 added lines

@@ -17,6 +17,9 @@ 
         $this->_em = $this->_getTestEntityManager();
     }
 
+    /**
+     * @param string $dql
+     */
     public function assertValidDQL($dql, $debug = false)
     {
         try {
@@ -30,6 +33,9 @@ 
         }
     }
 
+    /**
+     * @param string $dql
+     */
     public function assertInvalidDQL($dql, $debug = false)
     {
         try {

Unused Use Statements +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 namespace Doctrine\Tests\ORM\Query;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\Query,
-    Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Query\QueryException;
 use Doctrine\Tests\Mocks\MockTreeWalker;
 use Doctrine\Tests\OrmTestCase;
 

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $query->setDQL($dql);
 
         foreach ($hints as $key => $value) {
-        	$query->setHint($key, $value);
+            $query->setHint($key, $value);
         }
 
         $parser = new Query\Parser($query);

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
             $this->addToAssertionCount(1);
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
 
             $this->fail($e->getMessage());
@@ -42,8 +42,8 @@ 
             $this->fail('No syntax errors were detected, when syntax errors were expected');
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getMessage() . PHP_EOL;
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getMessage().PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
             $this->addToAssertionCount(1);
         }
@@ -112,7 +112,7 @@ 
             ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'],
 
             /* Checks for invalid AbstractSchemaName */
-            ['SELECT u FROM UnknownClass u'],  // unknown
+            ['SELECT u FROM UnknownClass u'], // unknown
             ['SELECT u FROM Unknown\Class u'], // unknown with namespace
             ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash
             ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\)
@@ -585,7 +585,7 @@ 
      */
     public function testDQLKeywordInJoinIsAllowed()
     {
-        $this->assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g');
+        $this->assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g');
     }
 
     /**
@@ -593,7 +593,7 @@ 
      */
     public function testDQLKeywordInConditionIsAllowed()
     {
-        $this->assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0');
+        $this->assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0');
     }
 
     /* The exception is currently thrown in the SQLWalker, not earlier.
@@ -698,7 +698,7 @@ 
      */
     public function testNewLiteralExpression()
     {
-        $this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        $this->assertValidDQL("SELECT new ".__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 
     /**
@@ -706,7 +706,7 @@ 
      */
     public function testNewLiteralWithSubselectExpression()
     {
-        $this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        $this->assertValidDQL("SELECT new ".__NAMESPACE__."\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 }
 

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

Doc Comments +12 added lines

@@ -373,6 +373,9 @@ 
         return $this->items;
     }
 
+    /**
+     * @param string $value
+     */
     public function setTransient($value) {
         if ($value != $this->transient) {
             $this->_onPropertyChanged('transient', $this->transient, $value);
@@ -384,6 +387,9 @@ 
         return $this->data;
     }
 
+    /**
+     * @param string $data
+     */
     public function setData($data) {
         if ($data != $this->data) {
             $this->_onPropertyChanged('data', $this->data, $data);
@@ -396,6 +402,9 @@ 
         $this->_listeners[] = $listener;
     }
 
+    /**
+     * @param string $propName
+     */
     protected function _onPropertyChanged($propName, $oldValue, $newValue) {
         if ($this->_listeners) {
             foreach ($this->_listeners as $listener) {
@@ -426,6 +435,9 @@ 
         return $this->owner;
     }
 
+    /**
+     * @param NotifyChangedEntity|null $owner
+     */
     public function setOwner($owner) {
         $this->owner = $owner;
     }

Spacing +5 added lines, -5 removed lines

@@ -425,7 +425,7 @@ 
             'empty string, single field'     => [$emptyString, ''],
             'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id],
             'empty strings, two fields'      => [$emptyStrings, ' '],
-            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1 . ' ' . $nonEmptyStrings->id2],
+            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1.' '.$nonEmptyStrings->id2],
             'boolean true'                   => [$booleanTrue, '1'],
             'boolean false'                  => [$booleanFalse, ''],
         ];
@@ -456,7 +456,7 @@ 
 
     public function entitiesWithInvalidIdentifiersProvider()
     {
-        $firstNullString  = new EntityWithCompositeStringIdentifier();
+        $firstNullString = new EntityWithCompositeStringIdentifier();
 
         $firstNullString->id2 = uniqid('id2', true);
 
@@ -515,7 +515,7 @@ 
             ->eventManager
             ->expects(self::any())
             ->method('hasListeners')
-            ->willReturnCallback(function ($eventName) {
+            ->willReturnCallback(function($eventName) {
                 return $eventName === Events::prePersist;
             });
         $this
@@ -524,7 +524,7 @@ 
             ->method('dispatchEvent')
             ->with(
                 self::anything(),
-                self::callback(function (LifecycleEventArgs $args) use ($entity, $generatedFieldValue) {
+                self::callback(function(LifecycleEventArgs $args) use ($entity, $generatedFieldValue) {
                     /* @var $object EntityWithRandomlyGeneratedField */
                     $object = $args->getObject();
 
@@ -564,7 +564,7 @@ 
             ->eventManager
             ->expects(self::any())
             ->method('hasListeners')
-            ->willReturnCallback(function ($eventName) {
+            ->willReturnCallback(function($eventName) {
                 return $eventName === Events::prePersist;
             });
         $this->eventManager->expects(self::never())->method('dispatchEvent');

tests/Doctrine/Tests/OrmTestCase.php

Doc Comments +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     protected $secondLevelCacheDriverImpl = null;
 
     /**
-     * @param array $paths
+     * @param string[] $paths
      * @param mixed $alias
      *
      * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
             }
         }
 
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
+        Annotations\AnnotationRegistry::registerFile(__DIR__."/../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php");
 
         return new AnnotationDriver($reader, (array) $paths);
     }
@@ -127,11 +127,11 @@ 
         $config->setMetadataCacheImpl($metadataCache);
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([], true));
         $config->setQueryCacheImpl(self::getSharedQueryCacheImpl());
-        $config->setProxyDir(__DIR__ . '/Proxies');
+        $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(
             [
-            realpath(__DIR__ . '/Models/Cache')
+            realpath(__DIR__.'/Models/Cache')
             ], true));
 
         if ($this->isSecondLevelCacheEnabled) {

lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php

Doc Comments +1 added lines

@@ -83,6 +83,7 @@
 
     /**
      * {@inheritDoc}
+     * @param string $value
      */
     public function setValue($object, $value = null)
     {

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

Doc Comments +4 added lines, -4 removed lines

@@ -182,7 +182,7 @@ 
 
 	/**
      *
-     * @param kateglo\application\models\Type $type
+     * @param Type $type
      * @return void
      */
 	public function addType(Type $type){
@@ -194,7 +194,7 @@ 
 
     /**
      *
-     * @param kateglo\application\models\Type $type
+     * @param Type $type
      * @return void
      */
     public function removeType(Type $type)
@@ -304,7 +304,7 @@ 
 
 	/**
 	 *
-	 * @param kateglo\application\models\Lemma $lemma
+	 * @param Lemma $lemma
 	 * @return void
 	 */
 	public function addLemma(Lemma $lemma)
@@ -317,7 +317,7 @@ 
 
 	/**
 	 *
-	 * @param kateglo\application\models\Lemma $lemma
+	 * @param Lemma $lemma
 	 * @return void
 	 */
 	public function removeLEmma(Lemma $lemma)

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;
     }
 }