doctrine / orm

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

Indentation +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
  */
 abstract class AbstractCollectionPersister implements CachedCollectionPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -67,9 +67,9 @@ 
      */
     protected $association;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = array();
 
     /**

lib/Doctrine/ORM/Cache/CollectionCacheKey.php

Spacing +1 added lines, -1 removed lines

@@ -61,6 +61,6 @@
         $this->ownerIdentifier  = $ownerIdentifier;
         $this->entityClass      = (string) $entityClass;
         $this->association      = (string) $association;
-        $this->hash             = str_replace('\\', '.', strtolower($entityClass)) . '_' . implode(' ', $ownerIdentifier) . '__' .  $association;
+        $this->hash             = str_replace('\\', '.', strtolower($entityClass)).'_'.implode(' ', $ownerIdentifier).'__'.$association;
     }
 }

lib/Doctrine/ORM/Cache/EntityCacheKey.php

Spacing +1 added lines, -1 removed lines

@@ -52,6 +52,6 @@
 
         $this->identifier  = $identifier;
         $this->entityClass = $entityClass;
-        $this->hash        = str_replace('\\', '.', strtolower($entityClass) . '_' . implode(' ', $identifier));
+        $this->hash        = str_replace('\\', '.', strtolower($entityClass).'_'.implode(' ', $identifier));
     }
 }

lib/Doctrine/ORM/Cache/Lock.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function __construct($value, $time = null)
     {
         $this->value = $value;
-        $this->time  = $time ? : time();
+        $this->time  = $time ?: time();
     }
 
     /**

lib/Doctrine/ORM/ORMException.php

Indentation +9 added lines, -9 removed lines

@@ -101,15 +101,15 @@
         return new self("Unrecognized field: $field");
     }
 
-     /**
-     *
-     * @param string $class
-     * @param string $association
-     * @param string $given
-     * @param string $expected
-     *
-     * @return \Doctrine\ORM\ORMInvalidArgumentException
-     */
+        /**
+         *
+         * @param string $class
+         * @param string $association
+         * @param string $given
+         * @param string $expected
+         *
+         * @return \Doctrine\ORM\ORMInvalidArgumentException
+         */
     public static function unexpectedAssociationValue($class, $association, $given, $expected)
     {
         return new self(sprintf('Found entity of type %s on association %s#%s, but expecting %s', $given, $class, $association, $expected));

Spacing +14 added lines, -14 removed lines

@@ -46,7 +46,7 @@ 
      */
     public static function namedQueryNotFound($queryName)
     {
-        return new self('Could not find a named query by the name "' . $queryName . '"');
+        return new self('Could not find a named query by the name "'.$queryName.'"');
     }
 
     /**
@@ -56,7 +56,7 @@ 
      */
     public static function namedNativeQueryNotFound($nativeQueryName)
     {
-        return new self('Could not find a named native query by the name "' . $nativeQueryName . '"');
+        return new self('Could not find a named native query by the name "'.$nativeQueryName.'"');
     }
 
     /**
@@ -68,10 +68,10 @@ 
     public static function entityMissingForeignAssignedId($entity, $relatedEntity)
     {
         return new self(
-            "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntity) . ", " .
-            "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity " .
-            "and make sure that an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " .
-            "of Post Insert ID Generation (such as MySQL Auto-Increment) this means you have to call " .
+            "Entity of type ".get_class($entity)." has identity through a foreign entity ".get_class($relatedEntity).", ".
+            "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity ".
+            "and make sure that an identifier was generated before trying to persist '".get_class($entity)."'. In case ".
+            "of Post Insert ID Generation (such as MySQL Auto-Increment) this means you have to call ".
             "EntityManager#flush() between both persist operations."
         );
     }
@@ -84,9 +84,9 @@ 
      */
     public static function entityMissingAssignedIdForField($entity, $field)
     {
-        return new self("Entity of type " . get_class($entity) . " is missing an assigned ID for field  '" . $field . "'. " .
+        return new self("Entity of type ".get_class($entity)." is missing an assigned ID for field  '".$field."'. ".
             "The identifier generation strategy for this entity requires the ID field to be populated before ".
-            "EntityManager#persist() is called. If you want automatically generated identifiers instead " .
+            "EntityManager#persist() is called. If you want automatically generated identifiers instead ".
             "you need to adjust the metadata mapping accordingly."
         );
     }
@@ -123,7 +123,7 @@ 
      */
     public static function invalidOrientation($className, $field)
     {
-        return new self("Invalid order by orientation specified for " . $className . "#" . $field);
+        return new self("Invalid order by orientation specified for ".$className."#".$field);
     }
 
     /**
@@ -240,7 +240,7 @@ 
      */
     public static function queryCacheUsesNonPersistentCache(CacheDriver $cache)
     {
-        return new self('Query Cache uses a non-persistent cache driver, ' . get_class($cache) . '.');
+        return new self('Query Cache uses a non-persistent cache driver, '.get_class($cache).'.');
     }
 
     /**
@@ -250,7 +250,7 @@ 
      */
     public static function metadataCacheUsesNonPersistentCache(CacheDriver $cache)
     {
-        return new self('Metadata Cache uses a non-persistent cache driver, ' . get_class($cache) . '.');
+        return new self('Metadata Cache uses a non-persistent cache driver, '.get_class($cache).'.');
     }
 
     /**
@@ -291,7 +291,7 @@ 
      */
     public static function missingIdentifierField($className, $fieldName)
     {
-        return new self("The identifier $fieldName is missing for a query of " . $className);
+        return new self("The identifier $fieldName is missing for a query of ".$className);
     }
 
     /**
@@ -303,8 +303,8 @@ 
     public static function unrecognizedIdentifierFields($className, $fieldNames)
     {
         return new self(
-            "Unrecognized identifier fields: '" . implode("', '", $fieldNames) . "' " .
-            "are not present on class '" . $className . "'."
+            "Unrecognized identifier fields: '".implode("', '", $fieldNames)."' ".
+            "are not present on class '".$className."'."
         );
     }
 

Doc Comments +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
     }
 
     /**
-     * @param object $entity
+     * @param Mapping\Entity $entity
      * @param string $field
      *
      * @return ORMException
@@ -108,7 +108,7 @@ 
      * @param string $given
      * @param string $expected
      *
-     * @return \Doctrine\ORM\ORMInvalidArgumentException
+     * @return ORMException
      */
     public static function unexpectedAssociationValue($class, $association, $given, $expected)
     {
@@ -296,7 +296,7 @@ 
 
     /**
      * @param string $className
-     * @param string $fieldName
+     * @param string $fieldNames
      *
      * @return ORMException
      */

lib/Doctrine/ORM/Tools/ToolsException.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
      */
     public static function schemaToolFailure($sql, \Exception $e)
     {
-        return new self("Schema-Tool failed with Error '" . $e->getMessage() . "' while executing DDL: " . $sql, "0", $e);
+        return new self("Schema-Tool failed with Error '".$e->getMessage()."' while executing DDL: ".$sql, "0", $e);
     }
 
     /**

lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php

Spacing +10 added lines, -10 removed lines

@@ -87,42 +87,42 @@
 
         fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n");
         foreach ($identityMap as $className => $map) {
-            fwrite($fh, "Class: ". $className . "\n");
+            fwrite($fh, "Class: ".$className."\n");
 
             foreach ($map as $entity) {
-                fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n");
+                fwrite($fh, " Entity: ".$this->getIdString($entity, $uow)." ".spl_object_hash($entity)."\n");
                 fwrite($fh, "  Associations:\n");
 
                 $cm = $em->getClassMetadata($className);
 
                 foreach ($cm->associationMappings as $field => $assoc) {
-                    fwrite($fh, "   " . $field . " ");
+                    fwrite($fh, "   ".$field." ");
                     $value = $cm->getFieldValue($entity, $field);
 
                     if ($assoc['type'] & ClassMetadata::TO_ONE) {
                         if ($value === null) {
                             fwrite($fh, " NULL\n");
                         } else {
-                            if ($value instanceof Proxy && !$value->__isInitialized()) {
+                            if ($value instanceof Proxy && ! $value->__isInitialized()) {
                                 fwrite($fh, "[PROXY] ");
                             }
 
-                            fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n");
+                            fwrite($fh, $this->getIdString($value, $uow)." ".spl_object_hash($value)."\n");
                         }
                     } else {
-                        $initialized = !($value instanceof PersistentCollection) || $value->isInitialized();
+                        $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
                         if ($value === null) {
                             fwrite($fh, " NULL\n");
                         } elseif ($initialized) {
-                            fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n");
+                            fwrite($fh, "[INITIALIZED] ".$this->getType($value)." ".count($value)." elements\n");
 
                             foreach ($value as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         } else {
-                            fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n");
+                            fwrite($fh, "[PROXY] ".$this->getType($value)." unknown element size\n");
                             foreach ($value->unwrap() as $obj) {
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
                             }
                         }
                     }

lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php

Indentation +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
         $code = $this->generateEntityRepositoryClass($fullClassName);
 
         $path = $outputDirectory . DIRECTORY_SEPARATOR
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
+                . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {

Spacing +4 added lines, -4 removed lines

@@ -111,7 +111,7 @@ 
     {
         $namespace = $this->getClassNamespace($fullClassName);
 
-        return $namespace ? 'namespace ' . $namespace . ';' : '';
+        return $namespace ? 'namespace '.$namespace.';' : '';
     }
 
     /**
@@ -126,7 +126,7 @@ 
         $repositoryName = $this->repositoryName ?: 'Doctrine\ORM\EntityRepository';
 
         if ($namespace && $repositoryName[0] !== '\\') {
-            $repositoryName = '\\' . $repositoryName;
+            $repositoryName = '\\'.$repositoryName;
         }
 
         return $repositoryName;
@@ -142,8 +142,8 @@ 
     {
         $code = $this->generateEntityRepositoryClass($fullClassName);
 
-        $path = $outputDirectory . DIRECTORY_SEPARATOR
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
+        $path = $outputDirectory.DIRECTORY_SEPARATOR
+              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName).'.php';
         $dir = dirname($path);
 
         if ( ! is_dir($dir)) {

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

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
             $this->orderByClause
-        )) . ')';
+        )).')';
     }
 
     /**