doctrine / orm

lib/Doctrine/ORM/AbstractQuery.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM;
 
@@ -306,7 +306,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());
@@ -355,14 +355,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);
 
@@ -451,7 +451,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->em->getClassMetadata($alias)->getClassName();
         };
 
@@ -513,7 +513,7 @@ 
      */
     public function setResultCacheProfile(QueryCacheProfile $profile = null)
     {
-        if (! $profile->getResultCacheDriver()) {
+        if ( ! $profile->getResultCacheDriver()) {
             $resultCacheDriver = $this->em->getConfiguration()->getResultCacheImpl();
             $profile = $profile->setResultCacheDriver($resultCacheDriver);
         }
@@ -981,7 +981,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1115,6 +1115,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

lib/Doctrine/ORM/Mapping/ClassMetadata.php

Spacing +45 added lines, -45 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Mapping;
 
@@ -308,7 +308,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_hash($this);
+        return __CLASS__.'@'.spl_object_hash($this);
     }
 
     /**
@@ -411,7 +411,7 @@ 
         // Restore ReflectionClass and properties
         $this->reflectionClass = $reflectionService->getClass($this->className);
 
-        if (! $this->reflectionClass) {
+        if ( ! $this->reflectionClass) {
             return;
         }
 
@@ -437,11 +437,11 @@ 
         }
 
         // Verify & complete identifier mapping
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             throw MappingException::identifierRequired($this->className);
         }
 
-        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, function (Property $property) : bool {
+        $explicitlyGeneratedProperties = array_filter($this->declaredProperties, function(Property $property) : bool {
             return $property instanceof FieldMetadata
                 && $property->isPrimaryKey()
                 && $property->hasValueGenerator();
@@ -462,14 +462,14 @@ 
     public function validateAssociations() : void
     {
         array_map(
-            function (Property $property) {
-                if (! ($property instanceof AssociationMetadata)) {
+            function(Property $property) {
+                if ( ! ($property instanceof AssociationMetadata)) {
                     return;
                 }
 
                 $targetEntity = $property->getTargetEntity();
 
-                if (! class_exists($targetEntity)) {
+                if ( ! class_exists($targetEntity)) {
                     throw MappingException::invalidTargetEntityClass($targetEntity, $this->className, $property->getName());
                 }
             },
@@ -491,7 +491,7 @@ 
         foreach ($this->lifecycleCallbacks as $callbacks) {
             /** @var array $callbacks */
             foreach ($callbacks as $callbackFuncName) {
-                if (! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
+                if ( ! $reflectionService->hasPublicMethod($this->className, $callbackFuncName)) {
                     throw MappingException::lifecycleCallbackMethodNotFound($this->className, $callbackFuncName);
                 }
             }
@@ -519,11 +519,11 @@ 
      */
     public function isIdentifier(string $fieldName) : bool
     {
-        if (! $this->identifier) {
+        if ( ! $this->identifier) {
             return false;
         }
 
-        if (! $this->isIdentifierComposite()) {
+        if ( ! $this->isIdentifierComposite()) {
             return $fieldName === $this->identifier[0];
         }
 
@@ -551,7 +551,7 @@ 
      */
     public function getNamedQuery($queryName) : string
     {
-        if (! isset($this->namedQueries[$queryName])) {
+        if ( ! isset($this->namedQueries[$queryName])) {
             throw MappingException::queryNotFound($this->className, $queryName);
         }
 
@@ -611,7 +611,7 @@ 
      */
     public function getSqlResultSetMapping($name)
     {
-        if (! isset($this->sqlResultSetMappings[$name])) {
+        if ( ! isset($this->sqlResultSetMappings[$name])) {
             throw MappingException::resultMappingNotFound($this->className, $name);
         }
 
@@ -646,7 +646,7 @@ 
             $property->setColumnName($columnName);
         }
 
-        if (! $this->isMappedSuperclass) {
+        if ( ! $this->isMappedSuperclass) {
             $property->setTableName($this->getTableName());
         }
 
@@ -666,7 +666,7 @@ 
                 throw MappingException::sqlConversionNotAllowedForPrimaryKeyProperties($property);
             }
 
-            if (! in_array($fieldName, $this->identifier)) {
+            if ( ! in_array($fieldName, $this->identifier)) {
                 $this->identifier[] = $fieldName;
             }
         }
@@ -720,7 +720,7 @@ 
         $fieldName    = $property->getName();
         $targetEntity = $property->getTargetEntity();
 
-        if (! $targetEntity) {
+        if ( ! $targetEntity) {
             throw MappingException::missingTargetEntity($fieldName);
         }
 
@@ -746,7 +746,7 @@ 
                 $this->identifier[] = $property->getName();
             }
 
-            if ($this->cache && !$property->getCache()) {
+            if ($this->cache && ! $property->getCache()) {
                 throw CacheException::nonCacheableEntityAssociation($this->className, $fieldName);
             }
 
@@ -800,7 +800,7 @@ 
                 /** @var JoinColumnMetadata $joinColumn */
                 if ($property instanceof OneToOneAssociationMetadata && $this->inheritanceType !== InheritanceType::SINGLE_TABLE) {
                     if (1 === count($property->getJoinColumns())) {
-                        if (! $property->isPrimaryKey()) {
+                        if ( ! $property->isPrimaryKey()) {
                             $joinColumn->setUnique(true);
                         }
                     } else {
@@ -808,13 +808,13 @@ 
                     }
                 }
 
-                $joinColumn->setTableName(! $this->isMappedSuperclass ? $this->getTableName() : null);
+                $joinColumn->setTableName( ! $this->isMappedSuperclass ? $this->getTableName() : null);
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $joinColumn->setColumnName($this->namingStrategy->joinColumnName($fieldName, $this->className));
                 }
 
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
@@ -842,7 +842,7 @@ 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades)) {
+            if ( ! in_array('remove', $cascades)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -908,14 +908,14 @@ 
         $property->setOwningSide(false);
 
         // OneToMany MUST have mappedBy
-        if (! $property->getMappedBy()) {
+        if ( ! $property->getMappedBy()) {
             throw MappingException::oneToManyRequiresMappedBy($property->getName());
         }
 
         if ($property->isOrphanRemoval()) {
             $cascades = $property->getCascade();
 
-            if (! in_array('remove', $cascades)) {
+            if ( ! in_array('remove', $cascades)) {
                 $cascades[] = 'remove';
 
                 $property->setCascade($cascades);
@@ -938,7 +938,7 @@ 
 
             $property->setJoinTable($joinTable);
 
-            if (! $joinTable->getName()) {
+            if ( ! $joinTable->getName()) {
                 $joinTableName = $this->namingStrategy->joinTableName(
                     $property->getSourceEntity(),
                     $property->getTargetEntity(),
@@ -950,7 +950,7 @@ 
 
             $selfReferencingEntityWithoutJoinColumns = $property->getSourceEntity() == $property->getTargetEntity() && ! $joinTable->hasColumns();
 
-            if (! $joinTable->getJoinColumns()) {
+            if ( ! $joinTable->getJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $sourceReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'source' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getSourceEntity(), $sourceReferenceName);
@@ -963,7 +963,7 @@ 
                 $joinTable->addJoinColumn($joinColumn);
             }
 
-            if (! $joinTable->getInverseJoinColumns()) {
+            if ( ! $joinTable->getInverseJoinColumns()) {
                 $referencedColumnName = $this->namingStrategy->referenceColumnName();
                 $targetReferenceName  = $selfReferencingEntityWithoutJoinColumns ? 'target' : $referencedColumnName;
                 $columnName           = $this->namingStrategy->joinKeyColumnName($property->getTargetEntity(), $targetReferenceName);
@@ -978,13 +978,13 @@ 
 
             foreach ($joinTable->getJoinColumns() as $joinColumn) {
                 /** @var JoinColumnMetadata $joinColumn */
-                if (! $joinColumn->getReferencedColumnName()) {
+                if ( ! $joinColumn->getReferencedColumnName()) {
                     $joinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getColumnName()) {
+                if ( ! $joinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getSourceEntity(),
                         $referencedColumnName
@@ -996,13 +996,13 @@ 
 
             foreach ($joinTable->getInverseJoinColumns() as $inverseJoinColumn) {
                 /** @var JoinColumnMetadata $inverseJoinColumn */
-                if (! $inverseJoinColumn->getReferencedColumnName()) {
+                if ( ! $inverseJoinColumn->getReferencedColumnName()) {
                     $inverseJoinColumn->setReferencedColumnName($this->namingStrategy->referenceColumnName());
                 }
 
                 $referencedColumnName = $inverseJoinColumn->getReferencedColumnName();
 
-                if (! $inverseJoinColumn->getColumnName()) {
+                if ( ! $inverseJoinColumn->getColumnName()) {
                     $columnName = $this->namingStrategy->joinKeyColumnName(
                         $property->getTargetEntity(),
                         $referencedColumnName
@@ -1099,7 +1099,7 @@ 
             // Association defined as Id field
             $targetClass = $em->getClassMetadata($property->getTargetEntity());
 
-            if (! $property->isOwningSide()) {
+            if ( ! $property->isOwningSide()) {
                 $property    = $targetClass->getProperty($property->getMappedBy());
                 $targetClass = $em->getClassMetadata($property->getTargetEntity());
             }
@@ -1114,7 +1114,7 @@ 
                 $columnName           = $joinColumn->getColumnName();
                 $referencedColumnName = $joinColumn->getReferencedColumnName();
 
-                if (! $joinColumn->getType()) {
+                if ( ! $joinColumn->getType()) {
                     $joinColumn->setType(PersisterHelper::getTypeOfColumn($referencedColumnName, $targetClass, $em));
                 }
 
@@ -1154,11 +1154,11 @@ 
     {
         $schema = null === $this->getSchemaName()
             ? ''
-            : $this->getSchemaName() . '_'
+            : $this->getSchemaName().'_'
         ;
 
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return $schema . $this->getTableName() . '_id_tmp';
+        return $schema.$this->getTableName().'_id_tmp';
     }
 
     /**
@@ -1218,7 +1218,7 @@ 
     {
         $fieldName = $property->getName();
 
-        if (! isset($this->declaredProperties[$fieldName])) {
+        if ( ! isset($this->declaredProperties[$fieldName])) {
             throw MappingException::invalidOverrideFieldName($this->className, $fieldName);
         }
 
@@ -1426,7 +1426,7 @@ 
         $declaringClass    = $property->getDeclaringClass();
 
         if ($inheritedProperty instanceof FieldMetadata) {
-            if (! $declaringClass->isMappedSuperclass) {
+            if ( ! $declaringClass->isMappedSuperclass) {
                 $inheritedProperty->setTableName($property->getTableName());
             }
 
@@ -1494,7 +1494,7 @@ 
             throw MappingException::duplicateQueryMapping($this->className, $name);
         }
 
-        if (! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
+        if ( ! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
             throw MappingException::missingQueryMapping($this->className, $name);
         }
 
@@ -1517,7 +1517,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->className);
         }
 
@@ -1527,7 +1527,7 @@ 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityResult) {
-                if (! isset($entityResult['entityClass'])) {
+                if ( ! isset($entityResult['entityClass'])) {
                     throw MappingException::missingResultSetMappingEntity($this->className, $resultMapping['name']);
                 }
 
@@ -1540,11 +1540,11 @@ 
 
                 if (isset($entityResult['fields'])) {
                     foreach ($entityResult['fields'] as $k => $field) {
-                        if (! isset($field['name'])) {
+                        if ( ! isset($field['name'])) {
                             throw MappingException::missingResultSetMappingFieldName($this->className, $resultMapping['name']);
                         }
 
-                        if (! isset($field['column'])) {
+                        if ( ! isset($field['column'])) {
                             $fieldName = $field['name'];
 
                             if (strpos($fieldName, '.')) {
@@ -1653,11 +1653,11 @@ 
             'method' => $method,
         ];
 
-        if (! class_exists($class)) {
+        if ( ! class_exists($class)) {
             throw MappingException::entityListenerClassNotFound($class, $this->className);
         }
 
-        if (! method_exists($class, $method)) {
+        if ( ! method_exists($class, $method)) {
             throw MappingException::entityListenerMethodNotFound($class, $method, $this->className);
         }
 
@@ -1733,7 +1733,7 @@ 
             return;
         }
 
-        if (! (class_exists($className) || interface_exists($className))) {
+        if ( ! (class_exists($className) || interface_exists($className))) {
             throw MappingException::invalidClassInDiscriminatorMap($className, $this->className);
         }
 

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

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -32,7 +32,7 @@ 
                 $this->em->getClassMetadata(DDC3027Dog::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -111,7 +111,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();
 
         self::assertCount(3, $persons);
@@ -124,7 +124,7 @@ 
             self::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) {
@@ -149,7 +149,7 @@ 
         $this->em->flush();
 
         // 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')
@@ -164,7 +164,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')
@@ -176,7 +176,7 @@ 
         self::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();
@@ -193,7 +193,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')
@@ -207,7 +207,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')
@@ -223,7 +223,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')
@@ -242,7 +242,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();
     }
 
@@ -251,7 +251,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();
     }
 
@@ -313,15 +313,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),
             ]
         );
     }