doctrine / orm

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

Indentation +6 added lines, -6 removed lines

@@ -41,9 +41,9 @@ 
  */
 abstract class AbstractEntityPersister implements CachedEntityPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -61,9 +61,9 @@ 
      */
     protected $class;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

Doc Comments +4 added lines, -2 removed lines

@@ -285,7 +285,7 @@ 
     /**
      * Generates a string of currently query
      *
-     * @param array   $query
+     * @param string   $query
      * @param string  $criteria
      * @param array   $orderBy
      * @param integer $limit
@@ -352,6 +352,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $fieldName
      */
     public function getOwningTable($fieldName)
     {
@@ -376,6 +377,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\Models\Cache\Country $entity
      */
     public function insert($entity)
     {
@@ -676,7 +678,7 @@ 
     }
 
     /**
-     * @param array $association
+     * @param AssociationMetadata $association
      * @param array $ownerId
      *
      * @return CollectionCacheKey

Unused Use Statements -2 removed lines

@@ -34,12 +34,10 @@
 use Doctrine\ORM\Mapping\FetchMode;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToManyAssociationMetadata;
-use Doctrine\ORM\Mapping\OneToOneAssociationMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
-
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Criteria;
 

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Entity;
 
@@ -299,7 +299,7 @@ 
             ? $this->persister->expandCriteriaParameters($criteria)
             : $this->persister->expandParameters($criteria);
 
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset);
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset);
     }
 
     /**

lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php

Indentation +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
  */
 class ReadOnlyCachedCollectionPersister extends NonStrictReadWriteCachedCollectionPersister
 {
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function update(PersistentCollection $collection)
     {
         if ($collection->isDirty() && $collection->getSnapshot()) {

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Collection;
 

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

Indentation +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
  */
 abstract class AbstractCollectionPersister implements CachedCollectionPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -67,9 +67,9 @@ 
      */
     protected $association;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Collection;
 
@@ -180,7 +180,7 @@ 
         $targetHydrator  = $targetPersister->getEntityHydrator();
 
         // Only preserve ordering if association configured it
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             // Elements may be an array or a Collection
             $elements = array_values(is_array($elements) ? $elements : $elements->getValues());
         }

lib/Doctrine/ORM/Cache/CacheConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      */
     public function getCacheLogger()
     {
-         return $this->cacheLogger;
+            return $this->cacheLogger;
     }
 
     /**
@@ -115,7 +115,7 @@ 
             );
         }
 
-         return $this->queryValidator;
+            return $this->queryValidator;
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 

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

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 use Doctrine\Tests\Models\Quote\Address;
 use Doctrine\Tests\Models\Quote\City;
 use Doctrine\Tests\Models\Quote\FullAddress;
-use Doctrine\Tests\Models\Quote\Group;
-use Doctrine\Tests\Models\Quote\Phone;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\OrmFunctionalTestCase;
 

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -37,7 +37,7 @@ 
     {
         $id = $this->createAddress();
 
-        $addresses = $this->em->createQuery('SELECT a FROM ' . Address::class . ' a WHERE a.id = :id')
+        $addresses = $this->em->createQuery('SELECT a FROM '.Address::class.' a WHERE a.id = :id')
             ->setParameter('id', $id)
             ->getResult();
 
@@ -58,7 +58,7 @@ 
     {
         $id = $this->createFullAddress();
 
-        $addresses = $this->em->createQuery('SELECT a FROM ' . FullAddress::class . ' a WHERE a.id = :id')
+        $addresses = $this->em->createQuery('SELECT a FROM '.FullAddress::class.' a WHERE a.id = :id')
             ->setParameter('id', $id)
             ->getResult();
 

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Internal\Hydration\IterableResult;
 use Doctrine\ORM\Query\Parameter;

Indentation +12 added lines, -12 removed lines

@@ -88,18 +88,18 @@
     {
         $q = $this->em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a");
         $q2 = $q->expireQueryCache(true)
-          ->setQueryCacheLifetime(3600)
-          ->setQueryCacheDriver(null)
-          ->expireResultCache(true)
-          ->setHint('foo', 'bar')
-          ->setHint('bar', 'baz')
-          ->setParameter(1, 'bar')
-          ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
-          ->setResultCacheDriver(null)
-          ->setResultCacheId('foo')
-          ->setDQL('foo')
-          ->setFirstResult(10)
-          ->setMaxResults(10);
+            ->setQueryCacheLifetime(3600)
+            ->setQueryCacheDriver(null)
+            ->expireResultCache(true)
+            ->setHint('foo', 'bar')
+            ->setHint('bar', 'baz')
+            ->setParameter(1, 'bar')
+            ->setParameters(new ArrayCollection([new Parameter(2, 'baz')]))
+            ->setResultCacheDriver(null)
+            ->setResultCacheId('foo')
+            ->setDQL('foo')
+            ->setFirstResult(10)
+            ->setMaxResults(10);
 
         self::assertSame($q2, $q);
     }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Query;
 
@@ -166,7 +166,7 @@ 
             9 => "St Julien"
         ];
 
-        $query  = $this->em
+        $query = $this->em
                 ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)")
                 ->setParameter('cities', $cities);
 
@@ -182,7 +182,7 @@ 
      */
     public function testProcessParameterValueClassMetadata()
     {
-        $query  = $this->em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
+        $query = $this->em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)");
         self::assertEquals(
             CmsAddress::class,
             $query->processParameterValue($this->em->getClassMetadata(CmsAddress::class))

lib/Doctrine/ORM/Query/Parser.php

Doc Comments +3 added lines, -3 removed lines

@@ -413,7 +413,7 @@ 
      * declarations (from ... x join ... y join ... z ...) appear in the query
      * as the hydration process relies on that order for proper operation.
      *
-     * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST
+     * @param AST\SelectStatement $AST
      *
      * @return void
      */
@@ -1617,7 +1617,7 @@ 
      * accessible is "FROM", prohibiting an easy implementation without larger
      * changes.}
      *
-     * @return \Doctrine\ORM\Query\AST\SubselectIdentificationVariableDeclaration |
+     * @return AST\IdentificationVariableDeclaration |
      *         \Doctrine\ORM\Query\AST\IdentificationVariableDeclaration
      */
     public function SubselectIdentificationVariableDeclaration()
@@ -1755,7 +1755,7 @@ 
     /**
      * JoinAssociationDeclaration ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy]
      *
-     * @return \Doctrine\ORM\Query\AST\JoinAssociationPathExpression
+     * @return AST\JoinAssociationDeclaration
      */
     public function JoinAssociationDeclaration()
     {

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 namespace Doctrine\ORM\Query;
 
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query;

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
  * <http://www.doctrine-project.org>.
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -487,7 +487,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
     }
@@ -634,7 +634,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -683,13 +683,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->getClassName() . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->getClassName().".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->getClassName() . " must contain the identifier.",
+                    "The partial field selection of class ".$class->getClassName()." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -758,9 +758,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -799,8 +799,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= (count($expectedStringTypes) == 1)
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -969,7 +969,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -984,7 +984,7 @@ 
      */
     private function validateAbstractSchemaName($schemaName)
     {
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
         }
     }
@@ -1040,7 +1040,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1053,8 +1053,8 @@ 
         $qComp = $this->queryComponents[$identVariable];
         $class = $qComp['metadata'];
 
-        if (! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2476,7 +2476,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], ["=",  "<", "<=", "<>", ">", ">=", "!="]) ||
+        if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) ||
             in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2581,7 +2581,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\DBAL\Driver\Connection;
-use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver;
 use Doctrine\DBAL\Logging\DebugStack;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Cache\CacheConfiguration;

Spacing +20 added lines, -20 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -401,7 +401,7 @@ 
             $conn->executeUpdate('DELETE FROM RoutingLocation');
         }
 
-        if(isset($this->usedModelSets['navigation'])) {
+        if (isset($this->usedModelSets['navigation'])) {
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
             $conn->executeUpdate('DELETE FROM navigation_photos');
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -409,7 +409,7 @@ 
             $conn->executeUpdate('DELETE FROM navigation_countries');
         }
         if (isset($this->usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file"));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -499,12 +499,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-group"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-phone"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-user"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-address"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -639,15 +639,15 @@ 
     {
         $this->setUpDBALTypes();
 
-        if (! isset(static::$sharedConn)) {
+        if ( ! isset(static::$sharedConn)) {
             static::$sharedConn = TestUtil::getConnection();
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
             } else if (static::$sharedConn->getDatabasePlatform()->getName() === "oracle") {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
             }
         }
 
@@ -657,7 +657,7 @@ 
         }
 
         foreach ($this->usedModelSets as $setName => $bool) {
-            if (! isset(static::$tablesCreated[$setName])) {
+            if ( ! isset(static::$tablesCreated[$setName])) {
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
 
                 static::$tablesCreated[$setName] = true;
@@ -700,7 +700,7 @@ 
 
         $config->setMetadataCacheImpl(self::$metadataCacheImpl);
         $config->setQueryCacheImpl(self::$queryCacheImpl);
-        $config->setProxyDir(__DIR__ . '/Proxies');
+        $config->setProxyDir(__DIR__.'/Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
         if (null !== $this->resultCacheImpl) {
@@ -732,8 +732,8 @@ 
 
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames')
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames')
             ])
         );
 
@@ -797,9 +797,9 @@ 
             $trace = $e->getTrace();
             $traceMsg = "";
 
-            foreach($trace AS $part) {
-                if(isset($part['file'])) {
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
+            foreach ($trace AS $part) {
+                if (isset($part['file'])) {
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
                         // Beginning with PHPUnit files we don't print the trace anymore.
                         break;
                     }
@@ -810,7 +810,7 @@ 
 
             $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg;
 
-            throw new \Exception($message, (int)$e->getCode(), $e);
+            throw new \Exception($message, (int) $e->getCode(), $e);
         }
 
         throw $e;

Braces +5 added lines, -1 removed lines

@@ -786,7 +786,11 @@
             foreach ($last25queries as $i => $query) {
                 $params = array_map(
                     function($p) {
-                        if (is_object($p)) return get_class($p); else return var_export($p, true);
+                        if (is_object($p)) {
+                            return get_class($p);
+                        } else {
+                            return var_export($p, true);
+                        }
                     },
                     $query['params'] ?: []
                 );

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

Doc Comments +8 added lines

@@ -161,8 +161,16 @@
     private $other2;
 
     public function getId() {return $this->id;}
+
+    /**
+     * @param MultiSelfReference $other1
+     */
     public function setOther1($other1) {$this->other1 = $other1;}
     public function getOther1() {return $this->other1;}
+
+    /**
+     * @param MultiSelfReference $other2
+     */
     public function setOther2($other2) {$this->other2 = $other2;}
     public function getOther2() {return $this->other2;}
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -161,9 +161,9 @@ 
      */
     private $other2;
 
-    public function getId() {return $this->id;}
-    public function setOther1($other1) {$this->other1 = $other1;}
-    public function getOther1() {return $this->other1;}
-    public function setOther2($other2) {$this->other2 = $other2;}
-    public function getOther2() {return $this->other2;}
+    public function getId() {return $this->id; }
+    public function setOther1($other1) {$this->other1 = $other1; }
+    public function getOther1() {return $this->other1; }
+    public function setOther2($other2) {$this->other2 = $other2; }
+    public function getOther2() {return $this->other2; }
 }