doctrine / orm

lib/Doctrine/ORM/Tools/Pagination/Paginator.php

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
         if ($this->count === null) {
             try {
                 $this->count = array_sum(array_map('current', $this->getCountQuery()->getScalarResult()));
-            } catch(NoResultException $e) {
+            } catch (NoResultException $e) {
                 $this->count = 0;
             }
         }
@@ -267,7 +267,7 @@ 
         foreach ($parameters as $key => $parameter) {
             $parameterName = $parameter->getName();
 
-            if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
+            if ( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
                 unset($parameters[$key]);
             }
         }

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
     public function exportClassMetadata(ClassMetadataInfo $metadata)
     {
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
 
@@ -97,7 +97,7 @@ 
 
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
 
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
             $root->addChild('change-tracking-policy', $trackingPolicy);
         }
 
@@ -108,7 +108,7 @@ 
                 $indexXml = $indexesXml->addChild('index');
                 $indexXml->addAttribute('name', $name);
                 $indexXml->addAttribute('columns', implode(',', $index['columns']));
-                if(isset($index['flags'])) {
+                if (isset($index['flags'])) {
                     $indexXml->addAttribute('flags', implode(',', $index['flags']));
                 }
             }
@@ -295,7 +295,7 @@ 
             }
 
             if (count($cascade) === 5) {
-                $cascade  = array('cascade-all');
+                $cascade = array('cascade-all');
             }
 
             if ($cascade) {
@@ -377,7 +377,7 @@ 
             }
         }
 
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
 
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -426,7 +426,7 @@ 
     {
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
 
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
             return;
         }
 

lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php

Spacing +3 added lines, -3 removed lines

@@ -135,13 +135,13 @@ 
 
         foreach ($this->_metadata as $metadata) {
             // In case output is returned, write it to a file, skip otherwise
-            if($output = $this->exportClassMetadata($metadata)){
+            if ($output = $this->exportClassMetadata($metadata)) {
                 $path = $this->_generateOutputPath($metadata);
                 $dir = dirname($path);
                 if ( ! is_dir($dir)) {
                     mkdir($dir, 0775, true);
                 }
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
                     throw ExportException::attemptOverwriteExistingFile($path);
                 }
                 file_put_contents($path, $output);
@@ -159,7 +159,7 @@ 
      */
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
     }
 
     /**

lib/Doctrine/ORM/Tools/SchemaTool.php

Spacing +9 added lines, -9 removed lines

@@ -222,7 +222,7 @@ 
                             $inheritedKeyColumns[] = $columnName;
                         }
                     }
-                    if (!empty($inheritedKeyColumns)) {
+                    if ( ! empty($inheritedKeyColumns)) {
                         // Add a FK constraint on the ID column
                         $table->addForeignKeyConstraint(
                             $this->quoteStrategy->getTableName(
@@ -265,11 +265,11 @@ 
 
             if (isset($class->table['indexes'])) {
                 foreach ($class->table['indexes'] as $indexName => $indexData) {
-                    if( ! isset($indexData['flags'])) {
+                    if ( ! isset($indexData['flags'])) {
                         $indexData['flags'] = array();
                     }
 
-                    $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array)$indexData['flags'], isset($indexData['options']) ? $indexData['options'] : array());
+                    $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], isset($indexData['options']) ? $indexData['options'] : array());
                 }
             }
 
@@ -316,7 +316,7 @@ 
             }
         }
 
-        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas() ) {
+        if ( ! $this->platform->supportsSchemas() && ! $this->platform->canEmulateSchemas()) {
             $schema->visit(new RemoveNamespacedAssets());
         }
 
@@ -390,7 +390,7 @@ 
 
         // For now, this is a hack required for single table inheritence, since this method is called
         // twice by single table inheritence relations
-        if (!$table->hasIndex('primary')) {
+        if ( ! $table->hasIndex('primary')) {
             //$table->setPrimaryKey($pkColumns);
         }
     }
@@ -626,7 +626,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."
                 );
             }
 
@@ -658,7 +658,7 @@ 
                 $columnOptions = array('notnull' => false, 'columnDefinition' => $columnDef);
 
                 if (isset($joinColumn['nullable'])) {
-                    $columnOptions['notnull'] = !$joinColumn['nullable'];
+                    $columnOptions['notnull'] = ! $joinColumn['nullable'];
                 }
 
                 if (isset($fieldMapping['options'])) {
@@ -705,7 +705,7 @@ 
                 }
             }
             $blacklistedFks[$compositeName] = true;
-        } elseif (!isset($blacklistedFks[$compositeName])) {
+        } elseif ( ! isset($blacklistedFks[$compositeName])) {
             $addedFks[$compositeName] = array('foreignTableName' => $foreignTableName, 'foreignColumns' => $foreignColumns);
             $theJoinTable->addUnnamedForeignKeyConstraint(
                 $foreignTableName,
@@ -812,7 +812,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/Tools/Console/Command/GenerateRepositoriesCommand.php

Spacing +3 added lines, -3 removed lines

@@ -110,12 +110,12 @@
 
             if ($numRepositories) {
                 // Outputting information message
-                $output->writeln(PHP_EOL . sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath) );
+                $output->writeln(PHP_EOL.sprintf('Repository classes generated to "<info>%s</INFO>"', $destPath));
             } else {
-                $output->writeln('No Repository classes were found to be processed.' );
+                $output->writeln('No Repository classes were found to be processed.');
             }
         } else {
-            $output->writeln('No Metadata Classes to process.' );
+            $output->writeln('No Metadata Classes to process.');
         }
     }
 }

lib/Doctrine/ORM/Tools/Console/Command/ClearCache/EntityRegionCommand.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
         ->addArgument('entity-class', InputArgument::OPTIONAL, 'The entity name.')
         ->addArgument('entity-id', InputArgument::OPTIONAL, 'The entity identifier.')
         ->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
-        ->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
+        ->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
 
 
         $this->setHelp(<<<EOT
@@ -95,7 +95,7 @@ 
         }
 
         if ($input->getOption('flush')) {
-            $entityRegion  = $cache->getEntityCacheRegion($entityClass);
+            $entityRegion = $cache->getEntityCacheRegion($entityClass);
 
             if ( ! $entityRegion instanceof DefaultRegion) {
                 throw new \InvalidArgumentException(sprintf(

lib/Doctrine/ORM/Tools/Console/Command/ClearCache/CollectionRegionCommand.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
         ->addArgument('association', InputArgument::OPTIONAL, 'The association collection name.')
         ->addArgument('owner-id', InputArgument::OPTIONAL, 'The owner identifier.')
         ->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
-        ->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
+        ->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
 
 
         $this->setHelp(<<<EOT
@@ -92,12 +92,12 @@ 
             throw new \InvalidArgumentException('No second-level cache is configured on the given EntityManager.');
         }
 
-        if ( (! $ownerClass || ! $assoc) && ! $input->getOption('all')) {
+        if (( ! $ownerClass || ! $assoc) && ! $input->getOption('all')) {
             throw new \InvalidArgumentException('Missing arguments "--owner-class" "--association"');
         }
 
         if ($input->getOption('flush')) {
-            $collectionRegion  = $cache->getCollectionCacheRegion($ownerClass, $assoc);
+            $collectionRegion = $cache->getCollectionCacheRegion($ownerClass, $assoc);
 
             if ( ! $collectionRegion instanceof DefaultRegion) {
                 throw new \InvalidArgumentException(sprintf(

lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryRegionCommand.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         ->setDescription('Clear a second-level cache query region.')
         ->addArgument('region-name', InputArgument::OPTIONAL, 'The query region to clear.')
         ->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all query regions will be deleted/invalidated.')
-        ->addOption('flush', null, InputOption::VALUE_NONE,'If defined, all cache entries will be flushed.');
+        ->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.');
 
 
         $this->setHelp(<<<EOT

lib/Doctrine/ORM/Tools/SchemaValidator.php

Spacing +60 added lines, -60 removed lines

@@ -89,80 +89,80 @@ 
         $cmf = $this->em->getMetadataFactory();
 
         foreach ($class->fieldMappings as $fieldName => $mapping) {
-            if (!Type::hasType($mapping['type'])) {
-                $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existant type '" . $mapping['type'] . "'.";
+            if ( ! Type::hasType($mapping['type'])) {
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existant 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.";
                 }
 
                 // Verify inverse side/owning side match each other
                 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.";
-                    } 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.";
-                    } 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.";
+                    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.";
+                    } 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.";
+                    } 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.";
                     }
                 }
             }
@@ -171,8 +171,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;
                         }
@@ -180,32 +180,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."'.";
                         }
                     }
@@ -217,9 +217,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.";
                     }
                 }
@@ -227,19 +227,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;
                     }
                 }
@@ -247,9 +247,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.";
             }
         }