doctrine / orm

lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php

Spacing +10 added lines, -10 removed lines

@@ -108,10 +108,10 @@ 
                 // It's a joined result
 
                 $parent = $this->_rsm->parentAliasMap[$dqlAlias];
-                $path   = $parent . '.' . $dqlAlias;
+                $path   = $parent.'.'.$dqlAlias;
 
                 // missing parent data, skipping as RIGHT JOIN hydration is not supported.
-                if ( ! isset($nonemptyComponents[$parent]) ) {
+                if ( ! isset($nonemptyComponents[$parent])) {
                     continue;
                 }
 
@@ -120,9 +120,9 @@ 
                 if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) {
                     $first = reset($this->_resultPointers);
                     // TODO: Exception if $key === null ?
-                    $baseElement =& $this->_resultPointers[$parent][key($first)];
+                    $baseElement = & $this->_resultPointers[$parent][key($first)];
                 } else if (isset($this->_resultPointers[$parent])) {
-                    $baseElement =& $this->_resultPointers[$parent];
+                    $baseElement = & $this->_resultPointers[$parent];
                 } else {
                     unset($this->_resultPointers[$dqlAlias]); // Ticket #1228
 
@@ -173,7 +173,7 @@ 
                     }
                 }
 
-                $coll =& $baseElement[$relationAlias];
+                $coll = & $baseElement[$relationAlias];
 
                 if (is_array($coll)) {
                     $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne);
@@ -185,7 +185,7 @@ 
                 $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0;
 
                 // if this row has a NULL value for the root result id then make it a null result.
-                if ( ! isset($nonemptyComponents[$dqlAlias]) ) {
+                if ( ! isset($nonemptyComponents[$dqlAlias])) {
                     $result[] = $this->_rsm->isMixed
                         ? [$entityKey => null]
                         : null;
@@ -246,7 +246,7 @@ 
                 $resultKey = $this->_resultCounter - 1;
             }
 
-            $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0);
+            $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0);
 
             foreach ($rowData['newObjects'] as $objIndex => $newObject) {
                 $class  = $newObject['class'];
@@ -284,13 +284,13 @@ 
         }
 
         if ($oneToOne) {
-            $this->_resultPointers[$dqlAlias] =& $coll;
+            $this->_resultPointers[$dqlAlias] = & $coll;
 
             return;
         }
 
         if ($index !== false) {
-            $this->_resultPointers[$dqlAlias] =& $coll[$index];
+            $this->_resultPointers[$dqlAlias] = & $coll[$index];
 
             return;
         }
@@ -300,7 +300,7 @@ 
         }
 
         end($coll);
-        $this->_resultPointers[$dqlAlias] =& $coll[key($coll)];
+        $this->_resultPointers[$dqlAlias] = & $coll[key($coll)];
 
         return;
     }

lib/Doctrine/ORM/Mapping/MappingException.php

Spacing +22 added lines, -22 removed lines

@@ -284,7 +284,7 @@ 
         $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required.";
 
         if ( ! empty($hint)) {
-            $message .= ' (Hint: ' . $hint . ')';
+            $message .= ' (Hint: '.$hint.')';
         }
 
         return new self($message);
@@ -314,7 +314,7 @@ 
      */
     public static function reflectionFailure($entity, \ReflectionException $previousException)
     {
-        return new self('An error occurred in ' . $entity, 0, $previousException);
+        return new self('An error occurred in '.$entity, 0, $previousException);
     }
 
     /**
@@ -325,8 +325,8 @@ 
      */
     public static function joinColumnMustPointToMappedField($className, $joinColumn)
     {
-        return new self('The column ' . $joinColumn . ' must be mapped to a field in class '
-            . $className . ' since it is referenced by a join column of another class.');
+        return new self('The column '.$joinColumn.' must be mapped to a field in class '
+            . $className.' since it is referenced by a join column of another class.');
     }
 
     /**
@@ -431,7 +431,7 @@ 
      */
     public static function noIdDefined($entity)
     {
-        return new self('No ID defined for entity ' . $entity);
+        return new self('No ID defined for entity '.$entity);
     }
 
     /**
@@ -456,12 +456,12 @@ 
     public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null)
     {
         if ( ! empty($path)) {
-            $path = '[' . $path . ']';
+            $path = '['.$path.']';
         }
 
         return new self(
-            'File mapping drivers must have a valid directory path, ' .
-            'however the given path ' . $path . ' seems to be incorrect!'
+            'File mapping drivers must have a valid directory path, '.
+            'however the given path '.$path.' seems to be incorrect!'
         );
     }
 
@@ -492,11 +492,11 @@ 
     public static function duplicateDiscriminatorEntry($className, array $entries, array $map)
     {
         return new self(
-            "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " .
-            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " .
-            "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map(
+            "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ".
+            "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ".
+            "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map(
                 function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map)
-            )) . "})"
+            ))."})"
         );
     }
 
@@ -643,7 +643,7 @@ 
     public static function illegalOrphanRemoval($className, $field)
     {
         return new self("Orphan removal is only allowed on one-to-one and one-to-many ".
-            "associations, but " . $className."#" .$field . " is not.");
+            "associations, but ".$className."#".$field." is not.");
     }
 
     /**
@@ -675,7 +675,7 @@ 
      */
     public static function noInheritanceOnMappedSuperClass($className)
     {
-        return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'.");
+        return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'.");
     }
 
     /**
@@ -687,8 +687,8 @@ 
     public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName)
     {
         return new self(
-            "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " .
-            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " .
+            "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ".
+            "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ".
             "to avoid this exception from occurring."
         );
     }
@@ -701,7 +701,7 @@ 
      */
     public static function lifecycleCallbackMethodNotFound($className, $methodName)
     {
-        return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback.");
+        return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback.");
     }
 
     /**
@@ -747,7 +747,7 @@ 
      */
     public static function invalidFetchMode($className, $annotation)
     {
-        return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'");
+        return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'");
     }
 
     /**
@@ -757,7 +757,7 @@ 
      */
     public static function compositeKeyAssignedIdGeneratorRequired($className)
     {
-        return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
+        return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported.");
     }
 
     /**
@@ -769,7 +769,7 @@ 
      */
     public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName)
     {
-        return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'.");
+        return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'.");
     }
 
     /**
@@ -781,7 +781,7 @@ 
      */
     public static function invalidCascadeOption(array $cascades, $className, $propertyName)
     {
-        $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades));
+        $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades));
 
         return new self(sprintf(
             "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'",
@@ -813,7 +813,7 @@ 
     {
         return new self(
             sprintf(
-                'Infinite nesting detected for embedded property %s::%s. ' .
+                'Infinite nesting detected for embedded property %s::%s. '.
                 'You cannot embed an embeddable from the same type inside an embeddable.',
                 $className,
                 $propertyName

lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
             $sql    = $type->convertToPHPValueSQL($sql, $this->platform);
         }
 
-        return $sql . ' AS ' . $columnAlias;
+        return $sql.' AS '.$columnAlias;
     }
 
     /**
@@ -94,6 +94,6 @@ 
 
         $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
 
-        return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
+        return $tableAlias.'.'.$quotedColumnName.' AS '.$columnAlias;
     }
 }

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +6 added lines, -6 removed lines

@@ -223,7 +223,7 @@ 
                             $inheritedKeyColumns[] = $columnName;
                         }
                     }
-                    if (!empty($inheritedKeyColumns)) {
+                    if ( ! empty($inheritedKeyColumns)) {
                         // Add a FK constraint on the ID column
                         $table->addForeignKeyConstraint(
                             $this->quoteStrategy->getTableName(
@@ -330,7 +330,7 @@ 
             }
         }
 
-        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas() ) {
+        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
             $schema->visit(new RemoveNamespacedAssets());
         }
 
@@ -635,7 +635,7 @@ 
             if ( ! $definingClass) {
                 throw new \Doctrine\ORM\ORMException(
                     "Column name `".$joinColumn['referencedColumnName']."` referenced for relation from ".
-                    $mapping['sourceEntity'] . " towards ". $mapping['targetEntity'] . " does not exist."
+                    $mapping['sourceEntity']." towards ".$mapping['targetEntity']." does not exist."
                 );
             }
 
@@ -667,7 +667,7 @@ 
                 $columnOptions = ['notnull' => false, 'columnDefinition' => $columnDef];
 
                 if (isset($joinColumn['nullable'])) {
-                    $columnOptions['notnull'] = !$joinColumn['nullable'];
+                    $columnOptions['notnull'] = ! $joinColumn['nullable'];
                 }
 
                 if (isset($fieldMapping['options'])) {
@@ -714,7 +714,7 @@ 
                 }
             }
             $blacklistedFks[$compositeName] = true;
-        } elseif (!isset($blacklistedFks[$compositeName])) {
+        } elseif ( ! isset($blacklistedFks[$compositeName])) {
             $addedFks[$compositeName] = ['foreignTableName' => $foreignTableName, 'foreignColumns' => $foreignColumns];
             $theJoinTable->addUnnamedForeignKeyConstraint(
                 $foreignTableName,
@@ -821,7 +821,7 @@ 
                 if ($table->hasPrimaryKey()) {
                     $columns = $table->getPrimaryKey()->getColumns();
                     if (count($columns) == 1) {
-                        $checkSequence = $table->getName() . "_" . $columns[0] . "_seq";
+                        $checkSequence = $table->getName()."_".$columns[0]."_seq";
                         if ($fullSchema->hasSequence($checkSequence)) {
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
                         }

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

Spacing +4 added lines, -4 removed lines

@@ -215,12 +215,12 @@ 
                 null === $this->fileLockRegionDirectory
             ) {
                 throw new \LogicException(
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
                 );
             }
 
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
         }
 
@@ -236,7 +236,7 @@ 
     {
         $cacheAdapter = clone $this->cache;
 
-        if (!$cacheAdapter instanceof CacheProvider) {
+        if ( ! $cacheAdapter instanceof CacheProvider) {
             return $cacheAdapter;
         }
 
@@ -246,7 +246,7 @@ 
             $namespace .= ':';
         }
 
-        $cacheAdapter->setNamespace($namespace . $name);
+        $cacheAdapter->setNamespace($namespace.$name);
 
         return $cacheAdapter;
     }

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

Doc Comments +4 added lines

@@ -110,6 +110,10 @@
     /** @Column(type = "string") */
     private $value;
 
+    /**
+     * @param string $name
+     * @param string $value
+     */
     public function __construct($name, $value)
     {
         $this->name = $name;

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $this->_em->flush();
 
         $asset->getAttributes()
-              ->removeElement($attribute1);
+                ->removeElement($attribute1);
 
         $idToBeRemoved = $attribute1->id;
 

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
                     $this->_em->getClassMetadata(DDC3785_Attribute::class)
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
@@ -152,7 +152,7 @@ 
      */
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        return (string)$value;
+        return (string) $value;
     }
 
     /**

lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php

Spacing +9 added lines, -9 removed lines

@@ -149,7 +149,7 @@ 
             $cacheAnnot = $classAnnotations[Mapping\Cache::class];
             $cacheMap   = [
                 'region' => $cacheAnnot->region,
-                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
             ];
 
             $metadata->enableCache($cacheMap);
@@ -237,7 +237,7 @@ 
             $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class];
 
             $metadata->setInheritanceType(
-                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value)
+                constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value)
             );
 
             if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
@@ -269,7 +269,7 @@ 
         // Evaluate DoctrineChangeTrackingPolicy annotation
         if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) {
             $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class];
-            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value));
+            $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value));
         }
 
         // Evaluate annotations on properties/fields
@@ -293,7 +293,7 @@ 
                 $mapping['cache'] = $metadata->getAssociationCacheDefaults(
                     $mapping['fieldName'],
                     [
-                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                        'usage'  => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
                         'region' => $cacheAnnot->region,
                     ]
                 );
@@ -323,7 +323,7 @@ 
                 }
 
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) {
-                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy));
+                    $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy));
                 }
 
                 if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) {
@@ -472,7 +472,7 @@ 
 
                 // Check for `fetch`
                 if ($associationOverride->fetch) {
-                    $override['fetch'] = constant(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch);
+                    $override['fetch'] = constant(Mapping\ClassMetadata::class.'::FETCH_'.$associationOverride->fetch);
                 }
 
                 $metadata->setAssociationOverride($fieldName, $override);
@@ -516,7 +516,7 @@ 
                 }
 
                 // Evaluate the listener using naming convention.
-                if ( ! $hasMapping ) {
+                if ( ! $hasMapping) {
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
                 }
             }
@@ -545,11 +545,11 @@ 
      */
     private function getFetchMode($className, $fetchMode)
     {
-        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
+        if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) {
             throw MappingException::invalidFetchMode($className, $fetchMode);
         }
 
-        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode);
+        return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode);
     }
 
     /**

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 +14 added lines, -14 removed lines

@@ -85,18 +85,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);
 
         $this->assertSame($q2, $q);
     }
@@ -254,11 +254,11 @@ 
         $this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache());
 
         $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u")
-                           ->useResultCache(true);
+                            ->useResultCache(true);
 
         /** @var DriverConnectionMock $driverConnectionMock */
         $driverConnectionMock = $this->_em->getConnection()
-                                          ->getWrappedConnection();
+                                            ->getWrappedConnection();
 
         $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]]));
 

Spacing +2 added lines, -2 removed lines

@@ -163,7 +163,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);
 
@@ -179,7 +179,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)");
         $this->assertEquals(
             CmsAddress::class,
             $query->processParameterValue($this->_em->getClassMetadata(CmsAddress::class))

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +57 added lines, -57 removed lines

@@ -89,66 +89,66 @@ 
         $cmf = $this->em->getMetadataFactory();
 
         foreach ($class->fieldMappings as $fieldName => $mapping) {
-            if (!Type::hasType($mapping['type'])) {
-                $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'.";
+            if ( ! Type::hasType($mapping['type'])) {
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existent type '".$mapping['type']."'.";
             }
         }
 
         foreach ($class->associationMappings as $fieldName => $assoc) {
-            if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
-                $ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.';
+            if ( ! class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) {
+                $ce[] = "The target entity '".$assoc['targetEntity']."' specified on ".$class->name.'#'.$fieldName.' is unknown or not an entity.';
 
                 return $ce;
             }
 
             if ($assoc['mappedBy'] && $assoc['inversedBy']) {
-                $ce[] = "The association " . $class . "#" . $fieldName . " cannot be defined as both inverse and owning.";
+                $ce[] = "The association ".$class."#".$fieldName." cannot be defined as both inverse and owning.";
             }
 
             $targetMetadata = $cmf->getMetadataFor($assoc['targetEntity']);
 
             if (isset($assoc['id']) && $targetMetadata->containsForeignIdentifier) {
-                $ce[] = "Cannot map association '" . $class->name. "#". $fieldName ." as identifier, because " .
-                        "the target entity '". $targetMetadata->name . "' also maps an association as identifier.";
+                $ce[] = "Cannot map association '".$class->name."#".$fieldName." as identifier, because ".
+                        "the target entity '".$targetMetadata->name."' also maps an association as identifier.";
             }
 
             if ($assoc['mappedBy']) {
                 if ($targetMetadata->hasField($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which is not defined as association, but as field.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which is not defined as association, but as field.";
                 }
-                if (!$targetMetadata->hasAssociation($assoc['mappedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['mappedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the inverse side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
-                            "'inversedBy=\"" . $fieldName . "\"' attribute.";
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
+                            "'inversedBy=\"".$fieldName."\"' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." are ".
                             "inconsistent with each other.";
                 }
             }
 
             if ($assoc['inversedBy']) {
                 if ($targetMetadata->hasField($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which is not defined as association.";
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which is not defined as association.";
                 }
 
-                if (!$targetMetadata->hasAssociation($assoc['inversedBy'])) {
-                    $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
-                            "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which does not exist.";
+                if ( ! $targetMetadata->hasAssociation($assoc['inversedBy'])) {
+                    $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ".
+                            "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which does not exist.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] == null) {
-                    $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ".
+                    $ce[] = "The field ".$class->name."#".$fieldName." is on the owning side of a ".
                             "bi-directional relationship, but the specified mappedBy association on the target-entity ".
-                            $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
+                            $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ".
                             "'inversedBy' attribute.";
                 } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] != $fieldName) {
-                    $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
-                            $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " are ".
+                    $ce[] = "The mappings ".$class->name."#".$fieldName." and ".
+                            $assoc['targetEntity']."#".$assoc['inversedBy']." are ".
                             "inconsistent with each other.";
                 }
 
@@ -156,14 +156,14 @@ 
                 if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) {
                     $targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']];
                     if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is one-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-one as well.";
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-one, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-many.";
                     } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY) {
-                        $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " .
-                                "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well.";
+                        $ce[] = "If association ".$class->name."#".$fieldName." is many-to-many, then the inversed ".
+                                "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be many-to-many as well.";
                     }
                 }
             }
@@ -172,8 +172,8 @@ 
                 if ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY) {
                     $identifierColumns = $class->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$class->name."'.";
                             break;
                         }
@@ -181,32 +181,32 @@ 
 
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) {
-                        if (!in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                 "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                             break;
                         }
                     }
 
                     if (count($targetMetadata->getIdentifierColumnNames()) != count($assoc['joinTable']['inverseJoinColumns'])) {
-                        $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))) .
+                        $ce[] = "The inverse join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))).
                                 "' are missing.";
                     }
 
                     if (count($class->getIdentifierColumnNames()) != count($assoc['joinTable']['joinColumns'])) {
-                        $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " .
-                                "have to contain to ALL identifier columns of the source entity '". $class->name . "', " .
-                                "however '" . implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) .
+                        $ce[] = "The join columns of the many-to-many table '".$assoc['joinTable']['name']."' ".
+                                "have to contain to ALL identifier columns of the source entity '".$class->name."', ".
+                                "however '".implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))).
                                 "' are missing.";
                     }
 
                 } elseif ($assoc['type'] & ClassMetadataInfo::TO_ONE) {
                     $identifierColumns = $targetMetadata->getIdentifierColumnNames();
                     foreach ($assoc['joinColumns'] as $joinColumn) {
-                        if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
-                            $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " .
+                        if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) {
+                            $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ".
                                     "has to be a primary key column on the target entity class '".$targetMetadata->name."'.";
                         }
                     }
@@ -218,9 +218,9 @@ 
                             $ids[] = $joinColumn['name'];
                         }
 
-                        $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " .
-                                "have to match to ALL identifier columns of the target entity '". $targetMetadata->name . "', " .
-                                "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)) .
+                        $ce[] = "The join columns of the association '".$assoc['fieldName']."' ".
+                                "have to match to ALL identifier columns of the target entity '".$targetMetadata->name."', ".
+                                "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)).
                                 "' are missing.";
                     }
                 }
@@ -228,19 +228,19 @@ 
 
             if (isset($assoc['orderBy']) && $assoc['orderBy'] !== null) {
                 foreach ($assoc['orderBy'] as $orderField => $orientation) {
-                    if (!$targetMetadata->hasField($orderField) && !$targetMetadata->hasAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a foreign field " .
-                                $orderField . " that is not a field on the target entity " . $targetMetadata->name . ".";
+                    if ( ! $targetMetadata->hasField($orderField) && ! $targetMetadata->hasAssociation($orderField)) {
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a foreign field ".
+                                $orderField." that is not a field on the target entity ".$targetMetadata->name.".";
                         continue;
                     }
                     if ($targetMetadata->isCollectionValuedAssociation($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is a collection-valued association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is a collection-valued association.";
                         continue;
                     }
                     if ($targetMetadata->isAssociationInverseSide($orderField)) {
-                        $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " .
-                                $orderField . " on " . $targetMetadata->name . " that is the inverse side of an association.";
+                        $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ".
+                                $orderField." on ".$targetMetadata->name." that is the inverse side of an association.";
                         continue;
                     }
                 }
@@ -248,9 +248,9 @@ 
         }
 
         foreach ($class->subClasses as $subClass) {
-            if (!in_array($class->name, class_parents($subClass))) {
-                $ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ".
-                        "of '" . $class->name . "' but these entities are not related through inheritance.";
+            if ( ! in_array($class->name, class_parents($subClass))) {
+                $ce[] = "According to the discriminator map class '".$subClass."' has to be a child ".
+                        "of '".$class->name."' but these entities are not related through inheritance.";
             }
         }