doctrine / orm

lib/Doctrine/ORM/AbstractQuery.php

Spacing +9 added lines, -9 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
 use Doctrine\Common\Collections\Collection;
-use Doctrine\Common\Collections\ArrayCollection;;
+use Doctrine\Common\Collections\ArrayCollection; ;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
@@ -305,7 +305,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -354,14 +354,14 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
             }
         );
 
-        if (! $filteredParameters->isEmpty()) {
+        if ( ! $filteredParameters->isEmpty()) {
             $parameter = $filteredParameters->first();
             $parameter->setValue($value, $type);
 
@@ -450,7 +450,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->em->getClassMetadata($alias)->getClassName();
         };
 
@@ -512,7 +512,7 @@ 
      */
     public function setResultCacheProfile(QueryCacheProfile $profile = null)
     {
-        if (! $profile->getResultCacheDriver()) {
+        if ( ! $profile->getResultCacheDriver()) {
             $resultCacheDriver = $this->em->getConfiguration()->getResultCacheImpl();
             $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
@@ -980,7 +980,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1114,6 +1114,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Utility/NormalizeIdentifier.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Utility;
 
@@ -25,7 +25,7 @@ 
         $normalizedAssociatedId = [];
 
         foreach ($targetClass->getDeclaredPropertiesIterator() as $name => $declaredProperty) {
-            if (! \array_key_exists($name, $flatIdentifier)) {
+            if ( ! \array_key_exists($name, $flatIdentifier)) {
                 continue;
             }
 

lib/Doctrine/ORM/Proxy/Factory/StaticProxyFactory.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Proxy\Factory;
 
@@ -71,7 +71,7 @@ 
      */
     public function generateProxyClasses(array $classMetadataList) : int
     {
-        $concreteClasses = \array_filter($classMetadataList, function (ClassMetadata $metadata) : bool {
+        $concreteClasses = \array_filter($classMetadataList, function(ClassMetadata $metadata) : bool {
             return ! ($metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract());
         });
 
@@ -82,7 +82,7 @@ 
                 ->proxyFactory
                 ->createProxy(
                     $className,
-                    function () {
+                    function() {
                         // empty closure, serves its purpose, for now
                     },
                     $this->cachedSkippedProperties[$className]
@@ -128,7 +128,7 @@ 
 
     private function makeInitializer(ClassMetadata $metadata, EntityPersister $persister) : \Closure
     {
-        return function (
+        return function(
             GhostObjectInterface $ghostObject,
             string $method, // we don't care
             array $parameters, // we don't care
@@ -141,7 +141,7 @@ 
             $identifier = $persister->getIdentifier($ghostObject);
 
             // @TODO how do we use `$properties` in the persister? That would be a massive optimisation
-            if (! $persister->loadById($identifier, $ghostObject)) {
+            if ( ! $persister->loadById($identifier, $ghostObject)) {
                 $initializer = $originalInitializer;
 
                 throw EntityNotFoundException::fromClassNameAndIdentifier(
@@ -167,7 +167,7 @@ 
         $transientFieldsFqns = [];
 
         foreach ($metadata->getDeclaredPropertiesIterator() as $name => $property) {
-            if (! $property instanceof TransientMetadata) {
+            if ( ! $property instanceof TransientMetadata) {
                 continue;
             }
 
@@ -202,11 +202,11 @@ 
     private function propertyFqcn(\ReflectionProperty $property) : string
     {
         if ($property->isPrivate()) {
-            return "\0" . $property->getDeclaringClass()->getName() . "\0" . $property->getName();
+            return "\0".$property->getDeclaringClass()->getName()."\0".$property->getName();
         }
 
         if ($property->isProtected()) {
-            return "\0*\0" . $property->getName();
+            return "\0*\0".$property->getName();
         }
 
         return $property->getName();

tests/Doctrine/Tests/ORM/Utility/NormalizeIdentifierTest.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Utility;
 
@@ -54,7 +54,7 @@ 
         self::assertSame(\array_keys($expectedId), \array_keys($id));
 
         foreach ($expectedId as $field => $value) {
-            if (! \is_object($value)) {
+            if ( ! \is_object($value)) {
                 self::assertSame($id[$field], $value);
 
                 continue;

tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Proxy;
 
@@ -205,7 +205,7 @@ 
                     self::isInstanceOf(CompanyEmployee::class)
                 )
             )
-            ->willReturnCallback(function (array $id, CompanyEmployee $companyEmployee) {
+            ->willReturnCallback(function(array $id, CompanyEmployee $companyEmployee) {
                 $companyEmployee->setSalary(1000); // A property on the CompanyEmployee
                 $companyEmployee->setName('Bob'); // A property on the parent class, CompanyPerson
 
@@ -264,7 +264,7 @@ 
                     self::isInstanceOf(ComparableObject::class)
                 )
             )
-            ->willReturnCallback(function (array $id, ComparableObject $comparableObject) {
+            ->willReturnCallback(function(array $id, ComparableObject $comparableObject) {
                 $comparableObject->setComparedFieldValue(\json_encode($id));
 
                 return $comparableObject;

tests/Doctrine/Tests/Models/IdentityIsAssociation/CompositeId.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\IdentityIsAssociation;
 

tests/Doctrine/Tests/Models/FriendObject/ComparableObject.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\FriendObject;
 

tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
-use Doctrine\ORM\Mapping\Driver\PHPDriver;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToManyAssociationMetadata;
 use Doctrine\ORM\Proxy\Factory\ProxyFactory;

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
@@ -65,7 +65,7 @@ 
             'xml'        => XmlDriver::class,
         ];
 
-        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
+        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
@@ -88,10 +88,10 @@ 
 
     public function testExportDirectoryAndFilesAreCreated()
     {
-        $this->deleteDirectory(__DIR__ . '/export/'.$this->getType());
+        $this->deleteDirectory(__DIR__.'/export/'.$this->getType());
 
         $type = $this->getType();
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -103,7 +103,7 @@ 
 
         $type = $this->getType();
         $cme = new ClassMetadataExporter();
-        $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
+        $exporter = $cme->getExporter($type, __DIR__.'/export/'.$type);
 
         if ($type === 'annotation') {
             $exporter->setEntityGenerator(new EntityGenerator());
@@ -115,9 +115,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
         } else {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
         }
     }
 
@@ -128,7 +128,7 @@ 
     {
         $type = $this->getType();
 
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/export/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/export/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -381,7 +381,7 @@ 
         $type = $this->getType();
 
         if ($type === 'xml') {
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:one-to-many[@field='interests']/d:cascade/d:*");
@@ -405,10 +405,10 @@ 
         if (is_file($path)) {
             return unlink($path);
         } else if (is_dir($path)) {
-            $files = glob(rtrim($path,'/').'/*');
+            $files = glob(rtrim($path, '/').'/*');
 
             if (is_array($files)) {
-                foreach ($files as $file){
+                foreach ($files as $file) {
                     $this->deleteDirectory($file);
                 }
             }

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -402,7 +402,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');
@@ -410,7 +410,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');
@@ -500,12 +500,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'])) {
@@ -640,15 +640,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');
             }
         }
 
@@ -658,7 +658,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;
@@ -733,8 +733,8 @@ 
 
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames')
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames')
             ])
         );
 
@@ -798,9 +798,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;
                     }
@@ -811,7 +811,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;