doctrine / orm

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

Spacing +2 added lines, -2 removed lines

@@ -299,7 +299,7 @@ 
                         : $value;
 
                     if ($cacheKeyInfo['isIdentifier'] && $value !== null) {
-                        $id[$dqlAlias] .= '|' . $value;
+                        $id[$dqlAlias] .= '|'.$value;
                         $nonemptyComponents[$dqlAlias] = true;
                     }
                     break;
@@ -337,7 +337,7 @@ 
             if ( ! isset($cacheKeyInfo['isScalar'])) {
                 $dqlAlias  = $cacheKeyInfo['dqlAlias'];
                 $type      = $cacheKeyInfo['type'];
-                $fieldName = $dqlAlias . '_' . $fieldName;
+                $fieldName = $dqlAlias.'_'.$fieldName;
                 $value     = $type
                     ? $type->convertToPHPValue($value, $this->_platform)
                     : $value;

Doc Comments +4 added lines, -4 removed lines

@@ -107,8 +107,8 @@ 
     /**
      * Initiates a row-by-row hydration.
      *
-     * @param object $stmt
-     * @param object $resultSetMapping
+     * @param \Doctrine\DBAL\Driver\Statement $stmt
+     * @param \Doctrine\ORM\Query\ResultSetMapping $resultSetMapping
      * @param array  $hints
      *
      * @return IterableResult
@@ -131,8 +131,8 @@ 
     /**
      * Hydrates all rows returned by the passed statement instance at once.
      *
-     * @param object $stmt
-     * @param object $resultSetMapping
+     * @param \Doctrine\DBAL\Driver\Statement $stmt
+     * @param \Doctrine\ORM\Query\ResultSetMapping $resultSetMapping
      * @param array  $hints
      *
      * @return array

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

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
      */
     public function valid()
     {
-        return ($this->_current!=false);
+        return ($this->_current != false);
     }
 }

lib/Doctrine/ORM/Query.php

Indentation +3 added lines, -3 removed lines

@@ -715,9 +715,9 @@
         );
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     protected function getHash()
     {
         return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults);

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
     /**
      * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts.
      */
-    const STATE_CLEAN  = 1;
+    const STATE_CLEAN = 1;
 
     /**
      * A query object is in state DIRTY when it has DQL parts that have not yet been
@@ -707,11 +707,11 @@ 
             ->getName();
 
         return md5(
-            $this->getDql() . serialize($this->_hints) .
-            '&platform=' . $platform .
-            ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') .
-            '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults .
-            '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
+            $this->getDql().serialize($this->_hints).
+            '&platform='.$platform.
+            ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '').
+            '&firstResult='.$this->_firstResult.'&maxResult='.$this->_maxResults.
+            '&hydrationMode='.$this->_hydrationMode.'&types='.serialize($this->_parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
         );
     }
 
@@ -720,7 +720,7 @@ 
      */
     protected function getHash()
     {
-        return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults);
+        return sha1(parent::getHash().'-'.$this->_firstResult.'-'.$this->_maxResults);
     }
 
     /**

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -116,7 +116,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
     
     /**
@@ -124,7 +124,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }
     

lib/Doctrine/ORM/Mapping/AnsiQuoteStrategy.php

Spacing +1 added lines, -1 removed lines

@@ -91,6 +91,6 @@
      */
     public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
     {
-        return $platform->getSQLResultCasing($columnName . '_' . $counter);
+        return $platform->getSQLResultCasing($columnName.'_'.$counter);
     }
 }

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

Indentation +7 added lines, -7 removed lines

@@ -707,13 +707,13 @@
         return $joinColumn;
     }
 
-     /**
-     * Parses the given field as array.
-     *
-     * @param SimpleXMLElement $fieldMapping
-     *
-     * @return array
-     */
+        /**
+         * Parses the given field as array.
+         *
+         * @param SimpleXMLElement $fieldMapping
+         *
+         * @return array
+         */
     private function columnToArray(SimpleXMLElement $fieldMapping)
     {
         $mapping = array(

Spacing +68 added lines, -68 removed lines

@@ -59,14 +59,14 @@ 
 
         if ($xmlRoot->getName() == 'entity') {
             if (isset($xmlRoot['repository-class'])) {
-                $metadata->setCustomRepositoryClass((string)$xmlRoot['repository-class']);
+                $metadata->setCustomRepositoryClass((string) $xmlRoot['repository-class']);
             }
             if (isset($xmlRoot['read-only']) && $this->evaluateBoolean($xmlRoot['read-only'])) {
                 $metadata->markReadOnly();
             }
         } else if ($xmlRoot->getName() == 'mapped-superclass') {
             $metadata->setCustomRepositoryClass(
-                isset($xmlRoot['repository-class']) ? (string)$xmlRoot['repository-class'] : null
+                isset($xmlRoot['repository-class']) ? (string) $xmlRoot['repository-class'] : null
             );
             $metadata->isMappedSuperclass = true;
         } else if ($xmlRoot->getName() == 'embeddable') {
@@ -97,8 +97,8 @@ 
         if (isset($xmlRoot->{'named-queries'})) {
             foreach ($xmlRoot->{'named-queries'}->{'named-query'} as $namedQueryElement) {
                 $metadata->addNamedQuery(array(
-                    'name'  => (string)$namedQueryElement['name'],
-                    'query' => (string)$namedQueryElement['query']
+                    'name'  => (string) $namedQueryElement['name'],
+                    'query' => (string) $namedQueryElement['query']
                 ));
             }
         }
@@ -107,10 +107,10 @@ 
         if (isset($xmlRoot->{'named-native-queries'})) {
             foreach ($xmlRoot->{'named-native-queries'}->{'named-native-query'} as $nativeQueryElement) {
                 $metadata->addNamedNativeQuery(array(
-                    'name'              => isset($nativeQueryElement['name']) ? (string)$nativeQueryElement['name'] : null,
-                    'query'             => isset($nativeQueryElement->query) ? (string)$nativeQueryElement->query : null,
-                    'resultClass'       => isset($nativeQueryElement['result-class']) ? (string)$nativeQueryElement['result-class'] : null,
-                    'resultSetMapping'  => isset($nativeQueryElement['result-set-mapping']) ? (string)$nativeQueryElement['result-set-mapping'] : null,
+                    'name'              => isset($nativeQueryElement['name']) ? (string) $nativeQueryElement['name'] : null,
+                    'query'             => isset($nativeQueryElement->query) ? (string) $nativeQueryElement->query : null,
+                    'resultClass'       => isset($nativeQueryElement['result-class']) ? (string) $nativeQueryElement['result-class'] : null,
+                    'resultSetMapping'  => isset($nativeQueryElement['result-set-mapping']) ? (string) $nativeQueryElement['result-set-mapping'] : null,
                 ));
             }
         }
@@ -125,14 +125,14 @@ 
                     if (isset($entityElement['entity-class'])) {
                         $entityResult = array(
                             'fields'                => array(),
-                            'entityClass'           => (string)$entityElement['entity-class'],
-                            'discriminatorColumn'   => isset($entityElement['discriminator-column']) ? (string)$entityElement['discriminator-column'] : null,
+                            'entityClass'           => (string) $entityElement['entity-class'],
+                            'discriminatorColumn'   => isset($entityElement['discriminator-column']) ? (string) $entityElement['discriminator-column'] : null,
                         );
 
                         foreach ($entityElement as $fieldElement) {
                             $entityResult['fields'][] = array(
-                                'name'      => isset($fieldElement['name']) ? (string)$fieldElement['name'] : null,
-                                'column'    => isset($fieldElement['column']) ? (string)$fieldElement['column'] : null,
+                                'name'      => isset($fieldElement['name']) ? (string) $fieldElement['name'] : null,
+                                'column'    => isset($fieldElement['column']) ? (string) $fieldElement['column'] : null,
                             );
                         }
 
@@ -142,13 +142,13 @@ 
                     //<column-result/>
                     if (isset($entityElement['name'])) {
                         $columns[] = array(
-                            'name' => (string)$entityElement['name'],
+                            'name' => (string) $entityElement['name'],
                         );
                     }
                 }
 
                 $metadata->addSqlResultSetMapping(array(
-                    'name'          => (string)$rsmElement['name'],
+                    'name'          => (string) $rsmElement['name'],
                     'entities'      => $entities,
                     'columns'       => $columns
                 ));
@@ -156,18 +156,18 @@ 
         }
 
         if (isset($xmlRoot['inheritance-type'])) {
-            $inheritanceType = (string)$xmlRoot['inheritance-type'];
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
+            $inheritanceType = (string) $xmlRoot['inheritance-type'];
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceType));
 
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate <discriminator-column...>
                 if (isset($xmlRoot->{'discriminator-column'})) {
                     $discrColumn = $xmlRoot->{'discriminator-column'};
                     $metadata->setDiscriminatorColumn(array(
-                        'name' => isset($discrColumn['name']) ? (string)$discrColumn['name'] : null,
-                        'type' => isset($discrColumn['type']) ? (string)$discrColumn['type'] : null,
-                        'length' => isset($discrColumn['length']) ? (string)$discrColumn['length'] : null,
-                        'columnDefinition' => isset($discrColumn['column-definition']) ? (string)$discrColumn['column-definition'] : null
+                        'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null,
+                        'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : null,
+                        'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : null,
+                        'columnDefinition' => isset($discrColumn['column-definition']) ? (string) $discrColumn['column-definition'] : null
                     ));
                 } else {
                     $metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255));
@@ -177,7 +177,7 @@ 
                 if (isset($xmlRoot->{'discriminator-map'})) {
                     $map = array();
                     foreach ($xmlRoot->{'discriminator-map'}->{'discriminator-mapping'} as $discrMapElement) {
-                        $map[(string)$discrMapElement['value']] = (string)$discrMapElement['class'];
+                        $map[(string) $discrMapElement['value']] = (string) $discrMapElement['class'];
                     }
                     $metadata->setDiscriminatorMap($map);
                 }
@@ -188,7 +188,7 @@ 
         // Evaluate <change-tracking-policy...>
         if (isset($xmlRoot['change-tracking-policy'])) {
             $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'
-                    . strtoupper((string)$xmlRoot['change-tracking-policy'])));
+                    . strtoupper((string) $xmlRoot['change-tracking-policy'])));
         }
 
         // Evaluate <indexes...>
@@ -225,7 +225,7 @@ 
                 }
 
                 if (isset($uniqueXml['name'])) {
-                    $metadata->table['uniqueConstraints'][(string)$uniqueXml['name']] = $unique;
+                    $metadata->table['uniqueConstraints'][(string) $uniqueXml['name']] = $unique;
                 } else {
                     $metadata->table['uniqueConstraints'][] = $unique;
                 }
@@ -285,29 +285,29 @@ 
         $associationIds = array();
         foreach ($xmlRoot->id as $idElement) {
             if (isset($idElement['association-key']) && $this->evaluateBoolean($idElement['association-key'])) {
-                $associationIds[(string)$idElement['name']] = true;
+                $associationIds[(string) $idElement['name']] = true;
                 continue;
             }
 
             $mapping = array(
                 'id' => true,
-                'fieldName' => (string)$idElement['name']
+                'fieldName' => (string) $idElement['name']
             );
 
             if (isset($idElement['type'])) {
-                $mapping['type'] = (string)$idElement['type'];
+                $mapping['type'] = (string) $idElement['type'];
             }
 
             if (isset($idElement['length'])) {
-                $mapping['length'] = (string)$idElement['length'];
+                $mapping['length'] = (string) $idElement['length'];
             }
 
             if (isset($idElement['column'])) {
-                $mapping['columnName'] = (string)$idElement['column'];
+                $mapping['columnName'] = (string) $idElement['column'];
             }
 
             if (isset($idElement['column-definition'])) {
-                $mapping['columnDefinition'] = (string)$idElement['column-definition'];
+                $mapping['columnDefinition'] = (string) $idElement['column-definition'];
             }
 
             if (isset($idElement->options)) {
@@ -318,7 +318,7 @@ 
 
             if (isset($idElement->generator)) {
                 $strategy = isset($idElement->generator['strategy']) ?
-                        (string)$idElement->generator['strategy'] : 'AUTO';
+                        (string) $idElement->generator['strategy'] : 'AUTO';
                 $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'
                         . $strategy));
             }
@@ -327,9 +327,9 @@ 
             if (isset($idElement->{'sequence-generator'})) {
                 $seqGenerator = $idElement->{'sequence-generator'};
                 $metadata->setSequenceGeneratorDefinition(array(
-                    'sequenceName' => (string)$seqGenerator['sequence-name'],
-                    'allocationSize' => (string)$seqGenerator['allocation-size'],
-                    'initialValue' => (string)$seqGenerator['initial-value']
+                    'sequenceName' => (string) $seqGenerator['sequence-name'],
+                    'allocationSize' => (string) $seqGenerator['allocation-size'],
+                    'initialValue' => (string) $seqGenerator['initial-value']
                 ));
             } else if (isset($idElement->{'custom-id-generator'})) {
                 $customGenerator = $idElement->{'custom-id-generator'};
@@ -345,8 +345,8 @@ 
         if (isset($xmlRoot->{'one-to-one'})) {
             foreach ($xmlRoot->{'one-to-one'} as $oneToOneElement) {
                 $mapping = array(
-                    'fieldName' => (string)$oneToOneElement['field'],
-                    'targetEntity' => (string)$oneToOneElement['target-entity']
+                    'fieldName' => (string) $oneToOneElement['field'],
+                    'targetEntity' => (string) $oneToOneElement['target-entity']
                 );
 
                 if (isset($associationIds[$mapping['fieldName']])) {
@@ -354,14 +354,14 @@ 
                 }
 
                 if (isset($oneToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$oneToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToOneElement['fetch']);
                 }
 
                 if (isset($oneToOneElement['mapped-by'])) {
-                    $mapping['mappedBy'] = (string)$oneToOneElement['mapped-by'];
+                    $mapping['mappedBy'] = (string) $oneToOneElement['mapped-by'];
                 } else {
                     if (isset($oneToOneElement['inversed-by'])) {
-                        $mapping['inversedBy'] = (string)$oneToOneElement['inversed-by'];
+                        $mapping['inversedBy'] = (string) $oneToOneElement['inversed-by'];
                     }
                     $joinColumns = array();
 
@@ -397,13 +397,13 @@ 
         if (isset($xmlRoot->{'one-to-many'})) {
             foreach ($xmlRoot->{'one-to-many'} as $oneToManyElement) {
                 $mapping = array(
-                    'fieldName' => (string)$oneToManyElement['field'],
-                    'targetEntity' => (string)$oneToManyElement['target-entity'],
-                    'mappedBy' => (string)$oneToManyElement['mapped-by']
+                    'fieldName' => (string) $oneToManyElement['field'],
+                    'targetEntity' => (string) $oneToManyElement['target-entity'],
+                    'mappedBy' => (string) $oneToManyElement['mapped-by']
                 );
 
                 if (isset($oneToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$oneToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $oneToManyElement['fetch']);
                 }
 
                 if (isset($oneToManyElement->cascade)) {
@@ -417,13 +417,13 @@ 
                 if (isset($oneToManyElement->{'order-by'})) {
                     $orderBy = array();
                     foreach ($oneToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
-                        $orderBy[(string)$orderByField['name']] = (string)$orderByField['direction'];
+                        $orderBy[(string) $orderByField['name']] = (string) $orderByField['direction'];
                     }
                     $mapping['orderBy'] = $orderBy;
                 }
 
                 if (isset($oneToManyElement['index-by'])) {
-                    $mapping['indexBy'] = (string)$oneToManyElement['index-by'];
+                    $mapping['indexBy'] = (string) $oneToManyElement['index-by'];
                 } else if (isset($oneToManyElement->{'index-by'})) {
                     throw new \InvalidArgumentException("<index-by /> is not a valid tag");
                 }
@@ -441,8 +441,8 @@ 
         if (isset($xmlRoot->{'many-to-one'})) {
             foreach ($xmlRoot->{'many-to-one'} as $manyToOneElement) {
                 $mapping = array(
-                    'fieldName' => (string)$manyToOneElement['field'],
-                    'targetEntity' => (string)$manyToOneElement['target-entity']
+                    'fieldName' => (string) $manyToOneElement['field'],
+                    'targetEntity' => (string) $manyToOneElement['target-entity']
                 );
 
                 if (isset($associationIds[$mapping['fieldName']])) {
@@ -450,11 +450,11 @@ 
                 }
 
                 if (isset($manyToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$manyToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToOneElement['fetch']);
                 }
 
                 if (isset($manyToOneElement['inversed-by'])) {
-                    $mapping['inversedBy'] = (string)$manyToOneElement['inversed-by'];
+                    $mapping['inversedBy'] = (string) $manyToOneElement['inversed-by'];
                 }
 
                 $joinColumns = array();
@@ -486,12 +486,12 @@ 
         if (isset($xmlRoot->{'many-to-many'})) {
             foreach ($xmlRoot->{'many-to-many'} as $manyToManyElement) {
                 $mapping = array(
-                    'fieldName' => (string)$manyToManyElement['field'],
-                    'targetEntity' => (string)$manyToManyElement['target-entity']
+                    'fieldName' => (string) $manyToManyElement['field'],
+                    'targetEntity' => (string) $manyToManyElement['target-entity']
                 );
 
                 if (isset($manyToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string)$manyToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.(string) $manyToManyElement['fetch']);
                 }
 
                 if (isset($manyToManyElement['orphan-removal'])) {
@@ -499,19 +499,19 @@ 
                 }
 
                 if (isset($manyToManyElement['mapped-by'])) {
-                    $mapping['mappedBy'] = (string)$manyToManyElement['mapped-by'];
+                    $mapping['mappedBy'] = (string) $manyToManyElement['mapped-by'];
                 } else if (isset($manyToManyElement->{'join-table'})) {
                     if (isset($manyToManyElement['inversed-by'])) {
-                        $mapping['inversedBy'] = (string)$manyToManyElement['inversed-by'];
+                        $mapping['inversedBy'] = (string) $manyToManyElement['inversed-by'];
                     }
 
                     $joinTableElement = $manyToManyElement->{'join-table'};
                     $joinTable = array(
-                        'name' => (string)$joinTableElement['name']
+                        'name' => (string) $joinTableElement['name']
                     );
 
                     if (isset($joinTableElement['schema'])) {
-                        $joinTable['schema'] = (string)$joinTableElement['schema'];
+                        $joinTable['schema'] = (string) $joinTableElement['schema'];
                     }
 
                     foreach ($joinTableElement->{'join-columns'}->{'join-column'} as $joinColumnElement) {
@@ -532,13 +532,13 @@ 
                 if (isset($manyToManyElement->{'order-by'})) {
                     $orderBy = array();
                     foreach ($manyToManyElement->{'order-by'}->{'order-by-field'} as $orderByField) {
-                        $orderBy[(string)$orderByField['name']] = (string)$orderByField['direction'];
+                        $orderBy[(string) $orderByField['name']] = (string) $orderByField['direction'];
                     }
                     $mapping['orderBy'] = $orderBy;
                 }
 
                 if (isset($manyToManyElement['index-by'])) {
-                    $mapping['indexBy'] = (string)$manyToManyElement['index-by'];
+                    $mapping['indexBy'] = (string) $manyToManyElement['index-by'];
                 } else if (isset($manyToManyElement->{'index-by'})) {
                     throw new \InvalidArgumentException("<index-by /> is not a valid tag");
                 }
@@ -611,7 +611,7 @@ 
         // Evaluate <lifecycle-callbacks...>
         if (isset($xmlRoot->{'lifecycle-callbacks'})) {
             foreach ($xmlRoot->{'lifecycle-callbacks'}->{'lifecycle-callback'} as $lifecycleCallback) {
-                $metadata->addLifecycleCallback((string)$lifecycleCallback['method'], constant('Doctrine\ORM\Events::' . (string)$lifecycleCallback['type']));
+                $metadata->addLifecycleCallback((string) $lifecycleCallback['method'], constant('Doctrine\ORM\Events::'.(string) $lifecycleCallback['type']));
             }
         }
 
@@ -620,7 +620,7 @@ 
             foreach ($xmlRoot->{'entity-listeners'}->{'entity-listener'} as $listenerElement) {
                 $className = (string) $listenerElement['class'];
                 // Evaluate the listener using naming convention.
-                if($listenerElement->count() === 0) {
+                if ($listenerElement->count() === 0) {
                     EntityListenerBuilder::bindEntityListener($metadata, $className);
 
                     continue;
@@ -678,8 +678,8 @@ 
     private function joinColumnToArray(SimpleXMLElement $joinColumnElement)
     {
         $joinColumn = array(
-            'name' => (string)$joinColumnElement['name'],
-            'referencedColumnName' => (string)$joinColumnElement['referenced-column-name']
+            'name' => (string) $joinColumnElement['name'],
+            'referencedColumnName' => (string) $joinColumnElement['referenced-column-name']
         );
 
         if (isset($joinColumnElement['unique'])) {
@@ -691,11 +691,11 @@ 
         }
 
         if (isset($joinColumnElement['on-delete'])) {
-            $joinColumn['onDelete'] = (string)$joinColumnElement['on-delete'];
+            $joinColumn['onDelete'] = (string) $joinColumnElement['on-delete'];
         }
 
         if (isset($joinColumnElement['column-definition'])) {
-            $joinColumn['columnDefinition'] = (string)$joinColumnElement['column-definition'];
+            $joinColumn['columnDefinition'] = (string) $joinColumnElement['column-definition'];
         }
 
         return $joinColumn;
@@ -769,12 +769,12 @@ 
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
 
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
         }
 
         if ($usage) {
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
         }
 
         return array(
@@ -815,12 +815,12 @@ 
 
         if (isset($xmlElement->entity)) {
             foreach ($xmlElement->entity as $entityElement) {
-                $entityName = (string)$entityElement['name'];
+                $entityName = (string) $entityElement['name'];
                 $result[$entityName] = $entityElement;
             }
         } else if (isset($xmlElement->{'mapped-superclass'})) {
             foreach ($xmlElement->{'mapped-superclass'} as $mappedSuperClass) {
-                $className = (string)$mappedSuperClass['name'];
+                $className = (string) $mappedSuperClass['name'];
                 $result[$className] = $mappedSuperClass;
             }
         } else if (isset($xmlElement->embeddable)) {
@@ -840,7 +840,7 @@ 
      */
     protected function evaluateBoolean($element)
     {
-        $flag = (string)$element;
+        $flag = (string) $element;
 
         return ($flag == "true" || $flag == "1");
     }

lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php

Spacing +7 added lines, -7 removed lines

@@ -49,10 +49,10 @@ 
         $tableName = $class->table['name'];
 
         if ( ! empty($class->table['schema'])) {
-            $tableName = $class->table['schema'] . '.' . $class->table['name'];
+            $tableName = $class->table['schema'].'.'.$class->table['name'];
 
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
-                $tableName = $class->table['schema'] . '__' . $class->table['name'];
+                $tableName = $class->table['schema'].'__'.$class->table['name'];
             }
         }
 
@@ -99,7 +99,7 @@ 
         $schema = '';
 
         if (isset($association['joinTable']['schema'])) {
-            $schema = $association['joinTable']['schema'] . '.';
+            $schema = $association['joinTable']['schema'].'.';
         }
 
         $tableName = $association['joinTable']['name'];
@@ -108,7 +108,7 @@ 
             $tableName = $platform->quoteIdentifier($tableName);
         }
 
-        return $schema . $tableName;
+        return $schema.$tableName;
     }
 
     /**
@@ -128,7 +128,7 @@ 
             // Association defined as Id field
             $joinColumns            = $class->associationMappings[$fieldName]['joinColumns'];
             $assocQuotedColumnNames = array_map(
-                function ($joinColumn) use ($platform)
+                function($joinColumn) use ($platform)
                 {
                     return isset($joinColumn['quoted'])
                         ? $platform->quoteIdentifier($joinColumn['name'])
@@ -153,10 +153,10 @@ 
         //     If the alias is to long, characters are cut off from the beginning.
         // 3 ) Strip non alphanumeric characters
         // 4 ) Prefix with "_" if the result its numeric
-        $columnName = $columnName . '_' . $counter;
+        $columnName = $columnName.'_'.$counter;
         $columnName = substr($columnName, -$platform->getMaxIdentifierLength());
         $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName);
-        $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName;
+        $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName;
 
         return $platform->getSQLResultCasing($columnName);
     }

lib/Doctrine/ORM/Mapping/Reflection/ReflectionPropertiesGetter.php

Spacing +2 added lines, -2 removed lines

@@ -155,9 +155,9 @@
         }
 
         if ($property->isProtected()) {
-            return "\0*\0" . $propertyName;
+            return "\0*\0".$propertyName;
         }
 
-        return "\0" . $property->getDeclaringClass()->getName() . "\0" . $propertyName;
+        return "\0".$property->getDeclaringClass()->getName()."\0".$propertyName;
     }
 }

lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php

Indentation +1 added lines, -1 removed lines

@@ -1431,7 +1431,7 @@
 
         if (Type::hasType($mapping['type']) && Type::getType($mapping['type'])->canRequireSQLConversion()) {
             if (isset($mapping['id']) && $mapping['id'] === true) {
-                 throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
+                    throw MappingException::sqlConversionNotAllowedForIdentifiers($this->name, $mapping['fieldName'], $mapping['type']);
             }
 
             $mapping['requireSQLConversion'] = true;

Doc Comments +5 added lines, -5 removed lines

@@ -667,7 +667,7 @@ 
     /**
      * Gets the ReflectionProperties of the mapped class.
      *
-     * @return array An array of ReflectionProperty instances.
+     * @return \ReflectionProperty[] An array of ReflectionProperty instances.
      */
     public function getReflectionProperties()
     {
@@ -804,7 +804,7 @@ 
      *      - reflClass (ReflectionClass)
      *      - reflFields (ReflectionProperty array)
      *
-     * @return array The names of all the fields that should be serialized.
+     * @return string[] The names of all the fields that should be serialized.
      */
     public function __sleep()
     {
@@ -904,7 +904,7 @@ 
     /**
      * Creates a new instance of the mapped class, without invoking the constructor.
      *
-     * @return object
+     * @return ClassMetadata
      */
     public function newInstance()
     {
@@ -1991,7 +1991,7 @@ 
      *
      * @param string $fieldName
      *
-     * @return \Doctrine\DBAL\Types\Type|string|null
+     * @return string
      */
     public function getTypeOfField($fieldName)
     {
@@ -2004,7 +2004,7 @@ 
      *
      * @param string $columnName
      *
-     * @return \Doctrine\DBAL\Types\Type|string|null
+     * @return string
      *
      * @deprecated this method is bogous and unreliable, since it cannot resolve the type of a column that is
      *             derived by a referenced field on a different entity.

Spacing +36 added lines, -36 removed lines

@@ -696,7 +696,7 @@ 
     public function getSingleIdReflectionProperty()
     {
         if ($this->isIdentifierComposite) {
-            throw new BadMethodCallException("Class " . $this->name . " has a composite identifier.");
+            throw new BadMethodCallException("Class ".$this->name." has a composite identifier.");
         }
         return $this->reflFields[$this->identifier[0]];
     }
@@ -790,7 +790,7 @@ 
      */
     public function __toString()
     {
-        return __CLASS__ . '@' . spl_object_hash($this);
+        return __CLASS__.'@'.spl_object_hash($this);
     }
 
     /**
@@ -1024,7 +1024,7 @@ 
     public function validateAssociations()
     {
         foreach ($this->associationMappings as $mapping) {
-            if ( ! ClassLoader::classExists($mapping['targetEntity']) ) {
+            if ( ! ClassLoader::classExists($mapping['targetEntity'])) {
                 throw MappingException::invalidTargetEntityClass($mapping['targetEntity'], $this->name, $mapping['fieldName']);
             }
         }
@@ -1091,7 +1091,7 @@ 
         }
 
         if ( ! isset($cache['region'])) {
-            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)) . '__' . $fieldName;
+            $cache['region'] = strtolower(str_replace('\\', '_', $this->rootEntityName)).'__'.$fieldName;
         }
 
         $this->associationMappings[$fieldName]['cache'] = $cache;
@@ -1440,7 +1440,7 @@ 
         $mapping['isOwningSide'] = true; // assume owning side until we hit mappedBy
 
         // unset optional indexBy attribute if its empty
-        if ( ! isset($mapping['indexBy']) || !$mapping['indexBy']) {
+        if ( ! isset($mapping['indexBy']) || ! $mapping['indexBy']) {
             unset($mapping['indexBy']);
         }
 
@@ -1453,7 +1453,7 @@ 
             $mapping['targetEntity'] = ltrim($mapping['targetEntity'], '\\');
         }
 
-        if ( ($mapping['type'] & self::MANY_TO_ONE) > 0 &&
+        if (($mapping['type'] & self::MANY_TO_ONE) > 0 &&
                 isset($mapping['orphanRemoval']) &&
                 $mapping['orphanRemoval'] == true) {
 
@@ -1528,11 +1528,11 @@ 
         }
 
         $mapping['cascade'] = $cascades;
-        $mapping['isCascadeRemove'] = in_array('remove',  $cascades);
-        $mapping['isCascadePersist'] = in_array('persist',  $cascades);
-        $mapping['isCascadeRefresh'] = in_array('refresh',  $cascades);
-        $mapping['isCascadeMerge'] = in_array('merge',  $cascades);
-        $mapping['isCascadeDetach'] = in_array('detach',  $cascades);
+        $mapping['isCascadeRemove'] = in_array('remove', $cascades);
+        $mapping['isCascadePersist'] = in_array('persist', $cascades);
+        $mapping['isCascadeRefresh'] = in_array('refresh', $cascades);
+        $mapping['isCascadeMerge'] = in_array('merge', $cascades);
+        $mapping['isCascadeDetach'] = in_array('detach', $cascades);
 
         return $mapping;
     }
@@ -1618,7 +1618,7 @@ 
             unset($mapping['unique']);
         }
 
-        if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
+        if (isset($mapping['id']) && $mapping['id'] === true && ! $mapping['isOwningSide']) {
             throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
         }
 
@@ -1675,7 +1675,7 @@ 
             }
 
             $selfReferencingEntityWithoutJoinColumns = $mapping['sourceEntity'] == $mapping['targetEntity']
-                && (! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
+                && ( ! (isset($mapping['joinTable']['joinColumns']) || isset($mapping['joinTable']['inverseJoinColumns'])));
 
             if ( ! isset($mapping['joinTable']['joinColumns'])) {
                 $mapping['joinTable']['joinColumns'] = array(array(
@@ -1864,7 +1864,7 @@ 
 
             // Association defined as Id field
             $joinColumns      = $this->associationMappings[$idProperty]['joinColumns'];
-            $assocColumnNames = array_map(function ($joinColumn) { return $joinColumn['name']; }, $joinColumns);
+            $assocColumnNames = array_map(function($joinColumn) { return $joinColumn['name']; }, $joinColumns);
 
             $columnNames = array_merge($columnNames, $assocColumnNames);
         }
@@ -2042,7 +2042,7 @@ 
     public function getTemporaryIdTableName()
     {
         // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
-        return str_replace('.', '_', $this->getTableName() . '_id_tmp');
+        return str_replace('.', '_', $this->getTableName().'_id_tmp');
     }
 
     /**
@@ -2364,7 +2364,7 @@ 
      */
     public function addNamedQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2372,7 +2372,7 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2398,7 +2398,7 @@ 
      */
     public function addNamedNativeQuery(array $queryMapping)
     {
-        if (!isset($queryMapping['name'])) {
+        if ( ! isset($queryMapping['name'])) {
             throw MappingException::nameIsMandatoryForQueryMapping($this->name);
         }
 
@@ -2406,11 +2406,11 @@ 
             throw MappingException::duplicateQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['query'])) {
+        if ( ! isset($queryMapping['query'])) {
             throw MappingException::emptyQueryMapping($this->name, $queryMapping['name']);
         }
 
-        if (!isset($queryMapping['resultClass']) && !isset($queryMapping['resultSetMapping'])) {
+        if ( ! isset($queryMapping['resultClass']) && ! isset($queryMapping['resultSetMapping'])) {
             throw MappingException::missingQueryMapping($this->name, $queryMapping['name']);
         }
 
@@ -2442,7 +2442,7 @@ 
      */
     public function addSqlResultSetMapping(array $resultMapping)
     {
-        if (!isset($resultMapping['name'])) {
+        if ( ! isset($resultMapping['name'])) {
             throw MappingException::nameIsMandatoryForSqlResultSetMapping($this->name);
         }
 
@@ -2452,7 +2452,7 @@ 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityResult) {
-                if (!isset($entityResult['entityClass'])) {
+                if ( ! isset($entityResult['entityClass'])) {
                     throw MappingException::missingResultSetMappingEntity($this->name, $resultMapping['name']);
                 }
 
@@ -2471,11 +2471,11 @@ 
 
                 if (isset($entityResult['fields'])) {
                     foreach ($entityResult['fields'] as $k => $field) {
-                        if (!isset($field['name'])) {
+                        if ( ! isset($field['name'])) {
                             throw MappingException::missingResultSetMappingFieldName($this->name, $resultMapping['name']);
                         }
 
-                        if (!isset($field['column'])) {
+                        if ( ! isset($field['column'])) {
                             $fieldName = $field['name'];
                             if (strpos($fieldName, '.')) {
                                 list(, $fieldName) = explode('.', $fieldName);
@@ -2840,7 +2840,7 @@ 
         return (
             isset($this->associationMappings[$fieldName]) &&
             isset($this->associationMappings[$fieldName]['joinColumns'][0]) &&
-            !isset($this->associationMappings[$fieldName]['joinColumns'][1])
+            ! isset($this->associationMappings[$fieldName]['joinColumns'][1])
         );
     }
 
@@ -2954,7 +2954,7 @@ 
         }
 
         if ($definition['sequenceName'][0] == '`') {
-            $definition['sequenceName']   = trim($definition['sequenceName'], '`');
+            $definition['sequenceName'] = trim($definition['sequenceName'], '`');
             $definition['quoted'] = true;
         }
 
@@ -3046,7 +3046,7 @@ 
     public function getAssociationTargetClass($assocName)
     {
         if ( ! isset($this->associationMappings[$assocName])) {
-            throw new InvalidArgumentException("Association name expected, '" . $assocName ."' is not an association.");
+            throw new InvalidArgumentException("Association name expected, '".$assocName."' is not an association.");
         }
 
         return $this->associationMappings[$assocName]['targetEntity'];
@@ -3085,7 +3085,7 @@ 
             // Association defined as Id field
             $joinColumns            = $this->associationMappings[$idProperty]['joinColumns'];
             $assocQuotedColumnNames = array_map(
-                function ($joinColumn) use ($platform) {
+                function($joinColumn) use ($platform) {
                     return isset($joinColumn['quoted'])
                         ? $platform->quoteIdentifier($joinColumn['name'])
                         : $joinColumn['name'];
@@ -3188,7 +3188,7 @@ 
         }
 
         if ($className !== null && strpos($className, '\\') === false && strlen($this->namespace) > 0) {
-            return $this->namespace . '\\' . $className;
+            return $this->namespace.'\\'.$className;
         }
 
         return $className;
@@ -3240,15 +3240,15 @@ 
                 ? $fieldMapping['originalClass']
                 : $embeddable->name;
             $fieldMapping['declaredField'] = isset($fieldMapping['declaredField'])
-                ? $property . '.' . $fieldMapping['declaredField']
+                ? $property.'.'.$fieldMapping['declaredField']
                 : $property;
             $fieldMapping['originalField'] = isset($fieldMapping['originalField'])
                 ? $fieldMapping['originalField']
                 : $fieldMapping['fieldName'];
-            $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName'];
+            $fieldMapping['fieldName'] = $property.".".$fieldMapping['fieldName'];
 
-            if (! empty($this->embeddedClasses[$property]['columnPrefix'])) {
-                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'] . $fieldMapping['columnName'];
+            if ( ! empty($this->embeddedClasses[$property]['columnPrefix'])) {
+                $fieldMapping['columnName'] = $this->embeddedClasses[$property]['columnPrefix'].$fieldMapping['columnName'];
             } elseif ($this->embeddedClasses[$property]['columnPrefix'] !== false) {
                 $fieldMapping['columnName'] = $this->namingStrategy
                     ->embeddedFieldToColumnName(
@@ -3290,7 +3290,7 @@ 
         $sequencePrefix = $this->getSequencePrefix($platform);
 
         $columnName   = $this->getSingleIdentifierColumnName();
-        $sequenceName = $sequencePrefix . '_' . $columnName . '_seq';
+        $sequenceName = $sequencePrefix.'_'.$columnName.'_seq';
 
         return $sequenceName;
     }
@@ -3310,10 +3310,10 @@ 
 
         // Prepend the schema name to the table name if there is one
         if ($schemaName = $this->getSchemaName()) {
-            $sequencePrefix = $schemaName . '.' . $tableName;
+            $sequencePrefix = $schemaName.'.'.$tableName;
 
             if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) {
-                $sequencePrefix = $schemaName . '__' . $tableName;
+                $sequencePrefix = $schemaName.'__'.$tableName;
             }
         }