doctrine / orm

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

Spacing +4 added lines, -4 removed lines

@@ -212,12 +212,12 @@ 
 
             if ( ! $this->fileLockRegionDirectory) {
                 throw new \LogicException(
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
                 );
             }
 
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
         }
 
@@ -233,7 +233,7 @@ 
     {
         $cacheAdapter = clone $this->cache;
 
-        if (!$cacheAdapter instanceof CacheProvider) {
+        if ( ! $cacheAdapter instanceof CacheProvider) {
             return $cacheAdapter;
         }
 
@@ -243,7 +243,7 @@ 
             $namespace .= ':';
         }
 
-        $cacheAdapter->setNamespace($namespace . $name);
+        $cacheAdapter->setNamespace($namespace.$name);
 
         return $cacheAdapter;
     }

lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php

Unused Use Statements -2 removed lines

@@ -20,10 +20,8 @@
 namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
-
 use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Type;
-
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Utility\PersisterHelper;
 

Spacing +19 added lines, -19 removed lines

@@ -207,7 +207,7 @@ 
                 }
 
                 foreach ($data as $columnName => $value) {
-                    if (!is_array($id) || !isset($id[$columnName])) {
+                    if ( ! is_array($id) || ! isset($id[$columnName])) {
                         $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]);
                     }
                 }
@@ -322,7 +322,7 @@ 
         // If the current class in the root entity, add the filters
         if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -341,29 +341,29 @@ 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
 
-                $lockSql = ' ' . $this->platform->getReadLockSql();
+                $lockSql = ' '.$this->platform->getReadLockSql();
 
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
 
-                $lockSql = ' ' . $this->platform->getWriteLockSql();
+                $lockSql = ' '.$this->platform->getWriteLockSql();
 
                 break;
         }
 
         $tableName  = $this->quoteStrategy->getTableName($this->class, $this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql != '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql != '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT '  . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -383,14 +383,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -409,16 +409,16 @@ 
             $conditions     = [];
             $tableAlias     = $this->getSQLTableAlias($parentClassName);
             $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql       .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -486,7 +486,7 @@ 
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -600,11 +600,11 @@ 
             $conditions   = [];
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableAlias   = $this->getSQLTableAlias($parentClassName);
-            $joinSql     .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -615,10 +615,10 @@ 
             $conditions  = [];
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);

tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\ORM\NotifyChangedEntity $entity
      */
     public function & getEntityChangeSet($entity)
     {

tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php

Unused Use Statements +6 added lines, -7 removed lines

@@ -4,13 +4,12 @@
 
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\Proxy\Proxy;
-use Doctrine\Tests\Models\Company\CompanyPerson,
-    Doctrine\Tests\Models\Company\CompanyEmployee,
-    Doctrine\Tests\Models\Company\CompanyManager,
-    Doctrine\Tests\Models\Company\CompanyOrganization,
-    Doctrine\Tests\Models\Company\CompanyAuction,
-    Doctrine\Tests\Models\Company\CompanyRaffle;
-
+use Doctrine\Tests\Models\Company\CompanyPerson;
+use Doctrine\Tests\Models\Company\CompanyEmployee;
+use Doctrine\Tests\Models\Company\CompanyManager;
+use Doctrine\Tests\Models\Company\CompanyOrganization;
+use Doctrine\Tests\Models\Company\CompanyAuction;
+use Doctrine\Tests\Models\Company\CompanyRaffle;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\Tests\OrmFunctionalTestCase;
 

tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php

Doc Comments +12 added lines

@@ -146,6 +146,12 @@ 
         return [$user1, $user2, $user3];
     }
 
+    /**
+     * @param string $name
+     * @param string $username
+     * @param string $status
+     * @param CmsAddress $address
+     */
     public function buildUser($name, $username, $status, $address)
     {
         $user = new CmsUser();
@@ -160,6 +166,12 @@ 
         return $user;
     }
 
+    /**
+     * @param string $country
+     * @param string $city
+     * @param string $street
+     * @param string $zip
+     */
     public function buildAddress($country, $city, $street, $zip)
     {
         $address = new CmsAddress();

tests/Doctrine/Tests/ORM/Functional/QueryTest.php

Unused Use Statements +3 added lines, -4 removed lines

@@ -3,14 +3,13 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\UnexpectedResultException;
-use Doctrine\Tests\Models\CMS\CmsUser,
-    Doctrine\Tests\Models\CMS\CmsArticle,
-    Doctrine\Tests\Models\CMS\CmsPhonenumber;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php

Doc Comments +7 added lines

@@ -173,6 +173,10 @@ 
      */
     public $phones;
 
+    /**
+     * @param string $email
+     * @param string $name
+     */
     public function __construct($email, $name, array $numbers = [])
     {
         $this->name   = $name;
@@ -208,6 +212,9 @@ 
      */
     public $user;
 
+    /**
+     * @param DDC1335User $user
+     */
     public function __construct($user, $number)
     {
         $this->user     = $user;

tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php

Doc Comments +8 added lines

@@ -119,6 +119,10 @@ 
      */
     public $driverRides;
 
+    /**
+     * @param integer $id
+     * @param string $name
+     */
     public function __construct($id, $name)
     {
         $this->driverRides = new ArrayCollection();
@@ -181,6 +185,10 @@ 
      */
     public $carRides;
 
+    /**
+     * @param string $brand
+     * @param string $model
+     */
     public function __construct($brand, $model)
     {
         $this->carRides = new ArrayCollection();

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

Doc Comments +7 added lines, -1 removed lines

@@ -227,6 +227,9 @@ 
         $this->assertEquals([], $metadata);
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $conn
+     */
     protected function _createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -255,7 +258,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function _createValidClassMetadata()
@@ -469,6 +471,10 @@ 
         return $this->mockMetadata[$className];
     }
 
+    /**
+     * @param string $className
+     * @param ClassMetadata $metadata
+     */
     public function setMetadataForClass($className, $metadata)
     {
         $this->mockMetadata[$className] = $metadata;