doctrine#1113 - minor CS fixes (spacing/alignment)

Ocramius · Ocramius · commit 2a99d5a19bda · 2015-02-16T01:02:56.000Z
diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
@@ -1649,16 +1649,19 @@ private function getSelectConditionStatementColumnSQL($field, $assoc = null)
             $association = $this->class->associationMappings[$field];
             // Many-To-Many requires join table check for joinColumn
             $columns = array();
-            $class = $this->class;
+            $class   = $this->class;
+
             if ($association['type'] === ClassMetadata::MANY_TO_MANY) {
                 if ( ! $association['isOwningSide']) {
                     $association = $assoc;
                 }
-                $joinColumns = $assoc['isOwningSide']
+
+                $joinTableName = $this->quoteStrategy->getJoinTableName($association, $class, $this->platform);
+                $joinColumns   = $assoc['isOwningSide']
                     ? $association['joinTable']['joinColumns']
                     : $association['joinTable']['inverseJoinColumns'];
 
-                $joinTableName  = $this->quoteStrategy->getJoinTableName($association, $class, $this->platform);
+
                 foreach ($joinColumns as $joinColumn) {
                     $columns[] = $joinTableName . '.' . $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform);
                 }
@@ -1691,7 +1694,6 @@ private function getSelectConditionStatementColumnSQL($field, $assoc = null)
         throw ORMException::unrecognizedField($field);
     }
 
-
     /**
      * Gets the conditional SQL fragment used in the WHERE clause when selecting
      * entities in this persister.
@@ -1812,6 +1814,7 @@ public function expandParameters($criteria)
             $types  = array_merge($types, $this->getTypes($field, $value, $this->class));
             $params = array_merge($params, $this->getValues($value));
         }
+
         return array($params, $types);
     }
 
@@ -1840,6 +1843,7 @@ private function expandToManyParameters($criteria)
             $types  = array_merge($types, $this->getTypes($criterion['field'], $criterion['value'], $criterion['class']));
             $params = array_merge($params, $this->getValues($criterion['value']));
         }
+
         return array($params, $types);
     }
 
@@ -1861,17 +1865,20 @@ private function getTypes($field, $value, ClassMetadata $class)
             case (isset($class->fieldMappings[$field])):
                 $types = array_merge($types, PersisterHelper::getTypeOfField($field, $class, $this->em));
                 break;
+
             case (isset($class->associationMappings[$field])):
                 $assoc = $class->associationMappings[$field];
                 $class = $this->em->getClassMetadata($assoc['targetEntity']);
-                if (!$assoc['isOwningSide']) {
+
+                if (! $assoc['isOwningSide']) {
                     $assoc = $class->associationMappings[$assoc['mappedBy']];
                     $class = $this->em->getClassMetadata($assoc['targetEntity']);
                 }
 
                 $columns = $assoc['type'] === ClassMetadata::MANY_TO_MANY
                     ? $assoc['relationToTargetKeyColumns']
                     : $assoc['sourceToTargetKeyColumns'];
+
                 foreach ($columns as $column){
                     $types[] = PersisterHelper::getTypeOfColumn($column, $class, $this->em);
                 }
@@ -1883,11 +1890,14 @@ private function getTypes($field, $value, ClassMetadata $class)
         }
 
         if (is_array($value)) {
-            $types = array_map(function ($type) {
-                $type = Type::getType($type)->getBindingType();
-                return $type + Connection::ARRAY_PARAM_OFFSET;
-            }, $types);
+            return array_map(
+                function ($type) {
+                    return Type::getType($type)->getBindingType() + Connection::ARRAY_PARAM_OFFSET;
+                },
+                $types
+            );
         }
+
         return $types;
     }
 
@@ -1914,6 +1924,7 @@ private function getValues($value)
             $class = $this->em->getClassMetadata(get_class($value));
             if ($class->isIdentifierComposite) {
                 $newValue = array();
+
                 foreach ($class->getIdentifierValues($value) as $innerValue) {
                     $newValue = array_merge($newValue, $this->getValues($innerValue));
                 }
diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
@@ -2629,7 +2629,9 @@ public function createEntity($className, array $data, &$hints = array())
                             } else {
                                 $associatedId[$targetClass->fieldNames[$targetColumn]] = $joinColumnValue;
                             }
-                        } elseif ($targetClass->containsForeignIdentifier && in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true)) {
+                        } elseif ($targetClass->containsForeignIdentifier
+                            && in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true)
+                        ) {
                             // the missing key is part of target's entity primary key
                             $associatedId = array();
                             break;
diff --git a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
@@ -73,6 +73,7 @@ public function flattenIdentifier(ClassMetadata $class, array $id)
 
         foreach ($class->identifier as $field) {
             if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
+                /* @var $targetClassMetadata ClassMetadata */
                 $targetClassMetadata = $this->metadataFactory->getMetadataFor(
                     $class->associationMappings[$field]['targetEntity']
                 );
@@ -86,9 +87,11 @@ public function flattenIdentifier(ClassMetadata $class, array $id)
                 $flatId[$field] = implode(' ', $associatedId);
             } elseif (isset($class->associationMappings[$field])) {
                 $associatedId = array();
+
                 foreach ($class->associationMappings[$field]['joinColumns'] as $joinColumn) {
                     $associatedId[] = $id[$joinColumn['name']];
                 }
+
                 $flatId[$field] = implode(' ', $associatedId);
             } else {
                 $flatId[$field] = $id[$field];
diff --git a/lib/Doctrine/ORM/Utility/PersisterHelper.php b/lib/Doctrine/ORM/Utility/PersisterHelper.php
@@ -66,11 +66,13 @@ public static function getTypeOfField($fieldName, ClassMetadata $class, EntityMa
             $joinData = $assoc;
         }
 
-        $types = array();
+        $types       = array();
         $targetClass = $em->getClassMetadata($assoc['targetEntity']);
+
         foreach ($joinData['joinColumns'] as $joinColumn) {
             $types[] = self::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $em);
         }
+
         return $types;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,13 @@ public static function getTypeOfField($fieldName, ClassMetadata $class, EntityMa`
`66`	`66`	`$joinData = $assoc;`
`67`	`67`	`}`
`68`	`68`
`69`		`- $types = array();`
	`69`	`+ $types = array();`
`70`	`70`	`$targetClass = $em->getClassMetadata($assoc['targetEntity']);`
	`71`	`+`
`71`	`72`	`foreach ($joinData['joinColumns'] as $joinColumn) {`
`72`	`73`	`$types[] = self::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $em);`
`73`	`74`	`}`
	`75`	`+`
`74`	`76`	`return $types;`
`75`	`77`	`}`
`76`	`78`