doctrine / orm

lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
         return $sqlWalker->getConnection()->getDatabasePlatform()->getLengthExpression(
-               $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
+                $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary)
         );
     }
 

lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php

Indentation +2 added lines, -2 removed lines

@@ -50,8 +50,8 @@
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
         return $sqlWalker->getConnection()->getDatabasePlatform()->getModExpression(
-               $sqlWalker->walkSimpleArithmeticExpression($this->firstSimpleArithmeticExpression),
-               $sqlWalker->walkSimpleArithmeticExpression($this->secondSimpleArithmeticExpression)
+                $sqlWalker->walkSimpleArithmeticExpression($this->firstSimpleArithmeticExpression),
+                $sqlWalker->walkSimpleArithmeticExpression($this->secondSimpleArithmeticExpression)
         );
     }
 

lib/Doctrine/ORM/Cache/TimestampCacheEntry.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
      */
     public function __construct($time = null)
     {
-        $this->time = $time ? (float)$time : microtime(true);
+        $this->time = $time ? (float) $time : microtime(true);
     }
 
     /**

lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $propertyName . '_' . $this->referenceColumnName();
+        return $propertyName.'_'.$this->referenceColumnName();
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return strtolower($this->classToTableName($sourceEntity) . '_' .
+        return strtolower($this->classToTableName($sourceEntity).'_'.
                 $this->classToTableName($targetEntity));
     }
     
@@ -88,7 +88,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return strtolower($this->classToTableName($entityName) . '_' .
+        return strtolower($this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName()));
     }
 }

lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php

Spacing +3 added lines, -3 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function nullable($flag = true)
     {
-        $this->mapping['nullable'] = (bool)$flag;
+        $this->mapping['nullable'] = (bool) $flag;
         return $this;
     }
 
@@ -99,7 +99,7 @@ 
      */
     public function unique($flag = true)
     {
-        $this->mapping['unique'] = (bool)$flag;
+        $this->mapping['unique'] = (bool) $flag;
         return $this;
     }
 
@@ -243,7 +243,7 @@ 
     {
         $cm = $this->builder->getClassMetadata();
         if ($this->generatedValue) {
-            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $this->generatedValue));
+            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$this->generatedValue));
         }
         if ($this->version) {
             $cm->setVersionMapping($this->mapping);

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

Spacing +7 added lines, -7 removed lines

@@ -175,7 +175,7 @@ 
         $this->reverseEngineerMappingFromDatabase();
 
         if ( ! isset($this->classToTableNames[$className])) {
-            throw new \InvalidArgumentException("Unknown class " . $className);
+            throw new \InvalidArgumentException("Unknown class ".$className);
         }
 
         $tableName = $this->classToTableNames[$className];
@@ -286,7 +286,7 @@ 
 
             if ( ! $table->hasPrimaryKey()) {
                 throw new MappingException(
-                    "Table " . $table->getName() . " has no primary key. Doctrine does not ".
+                    "Table ".$table->getName()." has no primary key. Doctrine does not ".
                     "support reverse engineering from tables that don't have a primary key."
                 );
             }
@@ -319,7 +319,7 @@ 
         $tableName = $metadata->table['name'];
         $indexes   = $this->tables[$tableName]->getIndexes();
 
-        foreach($indexes as $index){
+        foreach ($indexes as $index) {
             if ($index->isPrimary()) {
                 continue;
             }
@@ -407,7 +407,7 @@ 
             case Type::STRING:
             case Type::TEXT:
                 $fieldMapping['length'] = $column->getLength();
-                $fieldMapping['options']['fixed']  = $column->getFixed();
+                $fieldMapping['options']['fixed'] = $column->getFixed();
                 break;
 
             case Type::DECIMAL:
@@ -506,7 +506,7 @@ 
     {
         try {
             return $table->getPrimaryKey()->getColumns();
-        } catch(SchemaException $e) {
+        } catch (SchemaException $e) {
             // Do nothing
         }
 
@@ -523,10 +523,10 @@ 
     private function getClassNameForTable($tableName)
     {
         if (isset($this->classNamesForTables[$tableName])) {
-            return $this->namespace . $this->classNamesForTables[$tableName];
+            return $this->namespace.$this->classNamesForTables[$tableName];
         }
 
-        return $this->namespace . Inflector::classify(strtolower($tableName));
+        return $this->namespace.Inflector::classify(strtolower($tableName));
     }
 
     /**

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

Spacing +21 added lines, -21 removed lines

@@ -108,7 +108,7 @@ 
         // Evaluate named native queries
         if (isset($element['namedNativeQueries'])) {
             foreach ($element['namedNativeQueries'] as $name => $mappingElement) {
-                if (!isset($mappingElement['name'])) {
+                if ( ! isset($mappingElement['name'])) {
                     $mappingElement['name'] = $name;
                 }
                 $metadata->addNamedNativeQuery(array(
@@ -123,7 +123,7 @@ 
         // Evaluate sql result set mappings
         if (isset($element['sqlResultSetMappings'])) {
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
-                if (!isset($resultSetMapping['name'])) {
+                if ( ! isset($resultSetMapping['name'])) {
                     $resultSetMapping['name'] = $name;
                 }
 
@@ -168,17 +168,17 @@ 
         }
 
         if (isset($element['inheritanceType'])) {
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
 
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate discriminatorColumn
                 if (isset($element['discriminatorColumn'])) {
                     $discrColumn = $element['discriminatorColumn'];
                     $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['columnDefinition']) ? (string)$discrColumn['columnDefinition'] : 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['columnDefinition']) ? (string) $discrColumn['columnDefinition'] : null
                     ));
                 } else {
                     $metadata->setDiscriminatorColumn(array('name' => 'dtype', 'type' => 'string', 'length' => 255));
@@ -353,7 +353,7 @@ 
                 }
 
                 if (isset($oneToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
                 }
 
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -385,7 +385,7 @@ 
                 }
 
                 if (isset($oneToOneElement['orphanRemoval'])) {
-                    $mapping['orphanRemoval'] = (bool)$oneToOneElement['orphanRemoval'];
+                    $mapping['orphanRemoval'] = (bool) $oneToOneElement['orphanRemoval'];
                 }
 
                 $metadata->mapOneToOne($mapping);
@@ -407,7 +407,7 @@ 
                 );
 
                 if (isset($oneToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
                 }
 
                 if (isset($oneToManyElement['cascade'])) {
@@ -415,7 +415,7 @@ 
                 }
 
                 if (isset($oneToManyElement['orphanRemoval'])) {
-                    $mapping['orphanRemoval'] = (bool)$oneToManyElement['orphanRemoval'];
+                    $mapping['orphanRemoval'] = (bool) $oneToManyElement['orphanRemoval'];
                 }
 
                 if (isset($oneToManyElement['orderBy'])) {
@@ -448,7 +448,7 @@ 
                 }
 
                 if (isset($manyToOneElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
                 }
 
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -493,7 +493,7 @@ 
                 );
 
                 if (isset($manyToManyElement['fetch'])) {
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
                 }
 
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -547,7 +547,7 @@ 
                 }
 
                 if (isset($manyToManyElement['orphanRemoval'])) {
-                    $mapping['orphanRemoval'] = (bool)$manyToManyElement['orphanRemoval'];
+                    $mapping['orphanRemoval'] = (bool) $manyToManyElement['orphanRemoval'];
                 }
 
                 $metadata->mapManyToMany($mapping);
@@ -563,7 +563,7 @@ 
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
 
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
-                $override   = array();
+                $override = array();
 
                 // Check for joinColumn
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -581,7 +581,7 @@ 
                 if (isset($associationOverrideElement['joinTable'])) {
 
                     $joinTableElement   = $associationOverrideElement['joinTable'];
-                    $joinTable          =  array(
+                    $joinTable          = array(
                         'name' => $joinTableElement['name']
                     );
 
@@ -625,7 +625,7 @@ 
         if (isset($element['lifecycleCallbacks'])) {
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
                 foreach ($methods as $method) {
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
                 }
             }
         }
@@ -640,7 +640,7 @@ 
                     continue;
                 }
 
-                foreach ($entityListener as $eventName => $callbackElement){
+                foreach ($entityListener as $eventName => $callbackElement) {
                     foreach ($callbackElement as $methodName) {
                         $metadata->addEntityListener($eventName, $className, $methodName);
                     }
@@ -732,7 +732,7 @@ 
         }
 
         if (isset($column['unique'])) {
-            $mapping['unique'] = (bool)$column['unique'];
+            $mapping['unique'] = (bool) $column['unique'];
         }
 
         if (isset($column['options'])) {
@@ -766,12 +766,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(

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

Spacing +9 added lines, -9 removed lines

@@ -147,7 +147,7 @@ 
             $cacheAnnot = $classAnnotations['Doctrine\ORM\Mapping\Cache'];
             $cacheMap   = array(
                 '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);
@@ -227,7 +227,7 @@ 
         // Evaluate InheritanceType annotation
         if (isset($classAnnotations['Doctrine\ORM\Mapping\InheritanceType'])) {
             $inheritanceTypeAnnot = $classAnnotations['Doctrine\ORM\Mapping\InheritanceType'];
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value));
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value));
 
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
                 // Evaluate DiscriminatorColumn annotation
@@ -255,7 +255,7 @@ 
         // Evaluate DoctrineChangeTrackingPolicy annotation
         if (isset($classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'])) {
             $changeTrackingAnnot = $classAnnotations['Doctrine\ORM\Mapping\ChangeTrackingPolicy'];
-            $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
@@ -299,7 +299,7 @@ 
                 }
 
                 if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\GeneratedValue')) {
-                    $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, 'Doctrine\ORM\Mapping\Version')) {
@@ -400,7 +400,7 @@ 
             // Evaluate @Cache annotation
             if (($cacheAnnot = $this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\Cache')) !== null) {
                 $metadata->enableAssociationCache($mapping['fieldName'], array(
-                    'usage'         => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage),
+                    'usage'         => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage),
                     'region'        => $cacheAnnot->region,
                 ));
             }
@@ -479,7 +479,7 @@ 
                     }
                 }
                 // Evaluate the listener using naming convention.
-                if ( ! $hasMapping ) {
+                if ( ! $hasMapping) {
                     EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName);
                 }
             }
@@ -510,11 +510,11 @@ 
      */
     private function getFetchMode($className, $fetchMode)
     {
-        if( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) {
-            throw MappingException::invalidFetchMode($className,  $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);
     }
 
     /**

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

Spacing +12 added lines, -12 removed lines

@@ -105,7 +105,7 @@ 
      */
     protected function onNotFoundMetadata($className)
     {
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
             return;
         }
 
@@ -174,7 +174,7 @@ 
             $this->completeIdGeneratorMapping($class);
         }
 
-        if (!$class->isMappedSuperclass) {
+        if ( ! $class->isMappedSuperclass) {
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
 
                 if (isset($embeddableClass['inherited'])) {
@@ -263,7 +263,7 @@ 
      */
     protected function validateRuntimeMetadata($class, $parent)
     {
-        if ( ! $class->reflClass ) {
+        if ( ! $class->reflClass) {
             // only validate if there is a reflection class instance
             return;
         }
@@ -273,7 +273,7 @@ 
         $class->validateLifecycleCallbacks($this->getReflectionService());
 
         // verify inheritance
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
             if ( ! $parent) {
                 if (count($class->discriminatorMap) == 0) {
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -433,7 +433,7 @@ 
     {
         foreach ($parentClass->associationMappings as $field => $mapping) {
             if ($parentClass->isMappedSuperclass) {
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
                 $mapping['sourceEntity'] = $subClass->name;
@@ -481,11 +481,11 @@ 
             $embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
 
             $parentClass->mapEmbedded(array(
-                'fieldName' => $prefix . '.' . $property,
+                'fieldName' => $prefix.'.'.$property,
                 'class' => $embeddableMetadata->name,
                 'columnPrefix' => $embeddableClass['columnPrefix'],
                 'declaredField' => $embeddableClass['declaredField']
-                        ? $prefix . '.' . $embeddableClass['declaredField']
+                        ? $prefix.'.'.$embeddableClass['declaredField']
                         : $prefix,
                 'originalField' => $embeddableClass['originalField'] ?: $property,
             ));
@@ -502,7 +502,7 @@ 
      */
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
-        if (! $parentClass->isMappedSuperclass) {
+        if ( ! $parentClass->isMappedSuperclass) {
             return;
         }
 
@@ -701,14 +701,14 @@ 
             case ClassMetadata::GENERATOR_TYPE_CUSTOM:
                 $definition = $class->customGeneratorDefinition;
                 if ( ! class_exists($definition['class'])) {
-                    throw new ORMException("Can't instantiate custom generator : " .
+                    throw new ORMException("Can't instantiate custom generator : ".
                         $definition['class']);
                 }
                 $class->setIdGenerator(new $definition['class']);
                 break;
 
             default:
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
         }
     }
 
@@ -735,7 +735,7 @@ 
      */
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -759,7 +759,7 @@ 
      */
     private function getTargetPlatform()
     {
-        if (!$this->targetPlatform) {
+        if ( ! $this->targetPlatform) {
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
         }