doctrine / orm

lib/Doctrine/ORM/ORMInvalidArgumentException.php

Indentation +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
                             . (method_exists($entry, '__toString') ?
                                 "":
                                 " If you cannot find out which entity causes the problem"
-                               ." implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
+                                ." implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
     }
 
     /**

Spacing +19 added lines, -20 removed lines

@@ -34,7 +34,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -66,7 +66,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -78,7 +78,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -90,15 +90,14 @@ 
     static public function newEntityFoundThroughRelationship(array $assoc, $entry)
     {
         return new self("A new entity was found through the relationship '"
-                            . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
-                            . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
+                            . $assoc['sourceEntity']."#".$assoc['fieldName']."' that was not"
+                            . " configured to cascade persist operations for entity: ".self::objToStr($entry)."."
                             . " To solve this issue: Either explicitly call EntityManager#persist()"
                             . " on this unknown entity or configure cascade persist "
                             . " this association in the mapping for example @ManyToOne(..,cascade={\"persist\"})."
                             . (method_exists($entry, '__toString') ?
-                                "":
-                                " If you cannot find out which entity causes the problem"
-                               ." implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
+                                "" : " If you cannot find out which entity causes the problem"
+                               ." implement '".$assoc['targetEntity']."#__toString()' to get a clue."));
     }
 
     /**
@@ -109,8 +108,8 @@ 
      */
     static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
     {
-        return new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
-                        . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
+        return new self("A detached entity of type ".$assoc['targetEntity']." (".self::objToStr($entry).") "
+                        . " was found through the relationship '".$assoc['sourceEntity']."#".$assoc['fieldName']."' "
                         . "during cascading a persist operation.");
     }
 
@@ -121,7 +120,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
                 "from the database or registered as new through EntityManager#persist");
     }
 
@@ -133,7 +132,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -144,7 +143,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -155,7 +154,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -167,8 +166,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-                    ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+                    ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -176,7 +175,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }
 
@@ -221,6 +220,6 @@ 
      */
     private static function objToStr($obj)
     {
-        return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj);
+        return method_exists($obj, '__toString') ? (string) $obj : get_class($obj).'@'.spl_object_hash($obj);
     }
 }

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