doctrine / orm

lib/Doctrine/ORM/EntityManager.php

Spacing +11 added lines, -11 removed lines

@@ -227,8 +227,8 @@ 
      */
     public function transactional($func)
     {
-        if (!is_callable($func)) {
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
+        if ( ! is_callable($func)) {
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
         }
 
         $this->conn->beginTransaction();
@@ -358,7 +358,7 @@ 
     {
         if ($entity !== null) {
             @trigger_error(
-                'Calling ' . __METHOD__ . '() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine 3.0.',
+                'Calling '.__METHOD__.'() with any arguments to flush specific entities is deprecated and will not be supported in Doctrine 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -558,7 +558,7 @@ 
 
         if ($entityName !== null) {
             @trigger_error(
-                'Calling ' . __METHOD__ . '() with any arguments to clear specific entities is deprecated and will not be supported in Doctrine 3.0.',
+                'Calling '.__METHOD__.'() with any arguments to clear specific entities is deprecated and will not be supported in Doctrine 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -670,7 +670,7 @@ 
      */
     public function detach($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#detach()', $entity);
@@ -695,7 +695,7 @@ 
      */
     public function merge($entity)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         if ( ! is_object($entity)) {
             throw ORMInvalidArgumentException::invalidObject('EntityManager#merge()', $entity);
@@ -711,7 +711,7 @@ 
      */
     public function copy($entity, $deep = false)
     {
-        @trigger_error('Method ' . __METHOD__ . '() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
+        @trigger_error('Method '.__METHOD__.'() is deprecated and will be removed in Doctrine 3.0.', E_USER_DEPRECATED);
 
         throw new \BadMethodCallException("Not implemented.");
     }
@@ -785,7 +785,7 @@ 
      */
     public function isOpen()
     {
-        return (!$this->closed);
+        return ( ! $this->closed);
     }
 
     /**
@@ -896,7 +896,7 @@ 
                 sprintf(
                     'Invalid $connection argument of type %s given%s.',
                     is_object($connection) ? get_class($connection) : gettype($connection),
-                    is_object($connection) ? '' : ': "' . $connection . '"'
+                    is_object($connection) ? '' : ': "'.$connection.'"'
                 )
             );
         }
@@ -946,13 +946,13 @@ 
     {
         switch ($lockMode) {
             case LockMode::OPTIMISTIC:
-                if (!$class->isVersioned) {
+                if ( ! $class->isVersioned) {
                     throw OptimisticLockException::notVersioned($class->name);
                 }
                 break;
             case LockMode::PESSIMISTIC_READ:
             case LockMode::PESSIMISTIC_WRITE:
-                if (!$this->getConnection()->isTransactionActive()) {
+                if ( ! $this->getConnection()->isTransactionActive()) {
                     throw TransactionRequiredException::transactionRequired();
                 }
         }

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +6 added lines, -6 removed lines

@@ -60,9 +60,9 @@ 
      */
     public function __construct($case = CASE_LOWER, bool $numberAware = false)
     {
-        if (! $numberAware) {
+        if ( ! $numberAware) {
             @trigger_error(
-                'Creating ' . self::class . ' without making it number aware is deprecated and will be removed in Doctrine 3.0.',
+                'Creating '.self::class.' without making it number aware is deprecated and will be removed in Doctrine 3.0.',
                 E_USER_DEPRECATED
             );
         }
@@ -125,7 +125,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -133,7 +133,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -141,7 +141,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
 
     /**
@@ -149,7 +149,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }