doctrine / orm

tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         $query->setDQL($dql);
 
         foreach ($hints as $key => $value) {
-        	$query->setHint($key, $value);
+            $query->setHint($key, $value);
         }
 
         $parser = new Query\Parser($query);

Doc Comments +6 added lines

@@ -23,6 +23,9 @@ 
         $this->em = $this->getTestEntityManager();
     }
 
+    /**
+     * @param string $dql
+     */
     public function assertValidDQL($dql, $debug = false)
     {
         try {
@@ -37,6 +40,9 @@ 
         }
     }
 
+    /**
+     * @param string $dql
+     */
     public function assertInvalidDQL($dql, $debug = false)
     {
         try {

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Query;
 
@@ -30,7 +30,7 @@ 
             $this->addToAssertionCount(1);
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
 
             $this->fail($e->getMessage());
@@ -45,8 +45,8 @@ 
             $this->fail('No syntax errors were detected, when syntax errors were expected');
         } catch (QueryException $e) {
             if ($debug) {
-                echo $e->getMessage() . PHP_EOL;
-                echo $e->getTraceAsString() . PHP_EOL;
+                echo $e->getMessage().PHP_EOL;
+                echo $e->getTraceAsString().PHP_EOL;
             }
             $this->addToAssertionCount(1);
         }
@@ -115,7 +115,7 @@ 
             ['SELECT foo: FROM Doctrine\Tests\Models\CMS\CmsUser foo:'],
 
             /* Checks for invalid AbstractSchemaName */
-            ['SELECT u FROM UnknownClass u'],  // unknown
+            ['SELECT u FROM UnknownClass u'], // unknown
             ['SELECT u FROM Unknown\Class u'], // unknown with namespace
             ['SELECT u FROM \Unknown\Class u'], // unknown, leading backslash
             ['SELECT u FROM Unknown\\\\Class u'], // unknown, syntactically bogus (duplicate \\)
@@ -588,7 +588,7 @@ 
      */
     public function testDQLKeywordInJoinIsAllowed()
     {
-        self::assertValidDQL('SELECT u FROM ' . __NAMESPACE__ . '\DQLKeywordsModelUser u JOIN u.group g');
+        self::assertValidDQL('SELECT u FROM '.__NAMESPACE__.'\DQLKeywordsModelUser u JOIN u.group g');
     }
 
     /**
@@ -596,7 +596,7 @@ 
      */
     public function testDQLKeywordInConditionIsAllowed()
     {
-        self::assertValidDQL('SELECT g FROM ' . __NAMESPACE__ . '\DQLKeywordsModelGroup g WHERE g.from=0');
+        self::assertValidDQL('SELECT g FROM '.__NAMESPACE__.'\DQLKeywordsModelGroup g WHERE g.from=0');
     }
 
     /* The exception is currently thrown in the SQLWalker, not earlier.
@@ -701,7 +701,7 @@ 
      */
     public function testNewLiteralExpression()
     {
-        self::assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        self::assertValidDQL("SELECT new ".__NAMESPACE__."\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 
     /**
@@ -709,7 +709,7 @@ 
      */
     public function testNewLiteralWithSubselectExpression()
     {
-        self::assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
+        self::assertValidDQL("SELECT new ".__NAMESPACE__."\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
     }
 }
 

tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php

Indentation +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
     public function testCmsModelSet(string $path)
     {
         $this->em->getConfiguration()
-                 ->getMetadataDriverImpl()
-                 ->addPaths([$path]);
+                    ->getMetadataDriverImpl()
+                    ->addPaths([$path]);
 
         self::assertEmpty($this->validator->validateMapping());
     }

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools;
 
@@ -42,12 +42,12 @@ 
     public function modelSetProvider(): array
     {
         return [
-            'cms'        => [__DIR__ . '/../../Models/CMS'],
-            'company'    => [__DIR__ . '/../../Models/Company'],
-            'ecommerce'  => [__DIR__ . '/../../Models/ECommerce'],
-            'forum'      => [__DIR__ . '/../../Models/Forum'],
-            'navigation' => [__DIR__ . '/../../Models/Navigation'],
-            'routing'    => [__DIR__ . '/../../Models/Routing'],
+            'cms'        => [__DIR__.'/../../Models/CMS'],
+            'company'    => [__DIR__.'/../../Models/Company'],
+            'ecommerce'  => [__DIR__.'/../../Models/ECommerce'],
+            'forum'      => [__DIR__.'/../../Models/Forum'],
+            'navigation' => [__DIR__.'/../../Models/Navigation'],
+            'routing'    => [__DIR__.'/../../Models/Routing'],
         ];
     }
 

tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryWalkerTest.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     /**
      * Arbitrary Join
      */
-     public function testLimitSubqueryWithArbitraryJoin()
+        public function testLimitSubqueryWithArbitraryJoin()
     {
         $dql        = 'SELECT p, c FROM Doctrine\Tests\ORM\Tools\Pagination\MyBlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c';
         $query      = $this->entityManager->createQuery($dql);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Pagination;
 

tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php

Indentation +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
         $this->entityManager->getConnection()->setDatabasePlatform(new PostgreSqlPlatform);
 
         $query = $this->entityManager->createQuery(
-           'SELECT u, g, COUNT(g.id) AS hidden g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC'
+            'SELECT u, g, COUNT(g.id) AS hidden g_quantity FROM Doctrine\Tests\ORM\Tools\Pagination\User u JOIN u.groups g ORDER BY g_quantity, u.id DESC'
         );
         $limitQuery = clone $query;
         $limitQuery->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class);

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Pagination;
 

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

Indentation +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
     {
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
-              'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
+                'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
             . ' of \'Doctrine\Tests\ORM\Mapping\HierarchyBase\' to be properly mapped in the inheritance hierarchy.'
             . ' Alternatively you can make \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' an abstract class to'
             . ' avoid this exception from occurring.'

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 

tests/Doctrine/Tests/Models/Forum/ForumUser.php

Indentation +4 added lines, -4 removed lines

@@ -24,18 +24,18 @@
     public $avatar;
 
     public function getId() {
-    	return $this->id;
+        return $this->id;
     }
 
     public function getUsername() {
-    	return $this->username;
+        return $this->username;
     }
 
     public function getAvatar() {
-    	return $this->avatar;
+        return $this->avatar;
     }
 
     public function setAvatar(ForumAvatar $avatar) {
-    	$this->avatar = $avatar;
+        $this->avatar = $avatar;
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\Models\Forum;
 

tests/Doctrine/Tests/OrmPerformanceTestCase.php

Indentation +2 added lines, -2 removed lines

@@ -25,12 +25,12 @@
 
         if ($this->maxRunningTime != 0 && $time > $this->maxRunningTime) {
             $this->fail(
-              sprintf(
+                sprintf(
                 'expected running time: <= %s but was: %s',
 
                 $this->maxRunningTime,
                 $time
-              )
+                )
             );
         }
     }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -48,7 +48,7 @@ 
      */
     public function setMaxRunningTime($maxRunningTime)
     {
-        if (! (is_int($maxRunningTime) && $maxRunningTime >= 0)) {
+        if ( ! (is_int($maxRunningTime) && $maxRunningTime >= 0)) {
             throw new \InvalidArgumentException;
         }
 

lib/Doctrine/ORM/Query/Expr.php

Doc Comments +33 added lines, -33 removed lines

@@ -75,7 +75,7 @@ 
     /**
      * Creates an ASCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -87,7 +87,7 @@ 
     /**
      * Creates a DESCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -125,8 +125,8 @@ 
      *     // u.id <> ?1
      *     $q->where($q->expr()->neq('u.id', '?1'));
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param string $x Left expression.
+     * @param string $y Right expression.
      *
      * @return Expr\Comparison
      */
@@ -214,7 +214,7 @@ 
     /**
      * Creates an instance of AVG() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in AVG() function.
+     * @param string $x Argument to be used in AVG() function.
      *
      * @return Expr\Func
      */
@@ -226,7 +226,7 @@ 
     /**
      * Creates an instance of MAX() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MAX() function.
+     * @param string $x Argument to be used in MAX() function.
      *
      * @return Expr\Func
      */
@@ -238,7 +238,7 @@ 
     /**
      * Creates an instance of MIN() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MIN() function.
+     * @param string $x Argument to be used in MIN() function.
      *
      * @return Expr\Func
      */
@@ -250,7 +250,7 @@ 
     /**
      * Creates an instance of COUNT() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT() function.
+     * @param string $x Argument to be used in COUNT() function.
      *
      * @return Expr\Func
      */
@@ -262,7 +262,7 @@ 
     /**
      * Creates an instance of COUNT(DISTINCT) function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT(DISTINCT) function.
+     * @param string $x Argument to be used in COUNT(DISTINCT) function.
      *
      * @return string
      */
@@ -274,7 +274,7 @@ 
     /**
      * Creates an instance of EXISTS() function, with the given DQL Subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in EXISTS() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in EXISTS() function.
      *
      * @return Expr\Func
      */
@@ -298,7 +298,7 @@ 
     /**
      * Creates a SOME() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in SOME() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in SOME() function.
      *
      * @return Expr\Func
      */
@@ -310,7 +310,7 @@ 
     /**
      * Creates an ANY() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in ANY() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in ANY() function.
      *
      * @return Expr\Func
      */
@@ -334,7 +334,7 @@ 
     /**
      * Creates an ABS() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in ABS() function.
+     * @param integer $x Argument to be used in ABS() function.
      *
      * @return Expr\Func
      */
@@ -353,8 +353,8 @@ 
      *     // u.salary * u.percentAnnualSalaryIncrease
      *     $q->expr()->prod('u.salary', 'u.percentAnnualSalaryIncrease')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -372,7 +372,7 @@ 
      *     // u.monthlySubscriptionCount - 1
      *     $q->expr()->diff('u.monthlySubscriptionCount', '1')
      *
-     * @param mixed $x Left expression.
+     * @param integer $x Left expression.
      * @param mixed $y Right expression.
      *
      * @return Expr\Math
@@ -391,8 +391,8 @@ 
      *     // u.numChildren + 1
      *     $q->expr()->sum('u.numChildren', '1')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -411,7 +411,7 @@ 
      *     $expr->quot('u.total', 'u.period')
      *
      * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -423,7 +423,7 @@ 
     /**
      * Creates a SQRT() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in SQRT() function.
+     * @param integer $x Argument to be used in SQRT() function.
      *
      * @return Expr\Func
      */
@@ -502,7 +502,7 @@ 
      * Creates a LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -515,7 +515,7 @@ 
      * Creates a NOT LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -527,8 +527,8 @@ 
     /**
      * Creates a CONCAT() function expression with the given arguments.
      *
-     * @param mixed $x First argument to be used in CONCAT() function.
-     * @param mixed $y,... Other arguments to be used in CONCAT() function.
+     * @param string $x First argument to be used in CONCAT() function.
+     * @param string $y
      *
      * @return Expr\Func
      */
@@ -540,7 +540,7 @@ 
     /**
      * Creates a SUBSTRING() function expression with the given arguments.
      *
-     * @param mixed    $x    Argument to be used as string to be cropped by SUBSTRING() function.
+     * @param string    $x    Argument to be used as string to be cropped by SUBSTRING() function.
      * @param int      $from Initial offset to start cropping string. May accept negative values.
      * @param int|null $len  Length of crop. May accept negative values.
      *
@@ -559,7 +559,7 @@ 
     /**
      * Creates a LOWER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in LOWER() function.
+     * @param string $x Argument to be used in LOWER() function.
      *
      * @return Expr\Func A LOWER function expression.
      */
@@ -571,7 +571,7 @@ 
     /**
      * Creates an UPPER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in UPPER() function.
+     * @param string $x Argument to be used in UPPER() function.
      *
      * @return Expr\Func An UPPER function expression.
      */
@@ -583,7 +583,7 @@ 
     /**
      * Creates a LENGTH() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of LENGTH() function.
+     * @param string $x Argument to be used as argument of LENGTH() function.
      *
      * @return Expr\Func A LENGTH function expression.
      */
@@ -625,11 +625,11 @@ 
     /**
      * Creates an instance of BETWEEN() function, with the given argument.
      *
-     * @param mixed          $val Valued to be inspected by range values.
-     * @param integer|string $x   Starting range value to be used in BETWEEN() function.
-     * @param integer|string $y   End point value to be used in BETWEEN() function.
+     * @param string          $val Valued to be inspected by range values.
+     * @param integer $x   Starting range value to be used in BETWEEN() function.
+     * @param integer $y   End point value to be used in BETWEEN() function.
      *
-     * @return Expr\Func A BETWEEN expression.
+     * @return string A BETWEEN expression.
      */
     public function between($val, $x, $y)
     {
@@ -639,7 +639,7 @@ 
     /**
      * Creates an instance of TRIM() function, with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of TRIM() function.
+     * @param string $x Argument to be used as argument of TRIM() function.
      *
      * @return Expr\Func a TRIM expression.
      */

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -253,7 +253,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -435,7 +435,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -456,7 +456,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -468,7 +468,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -480,7 +480,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -598,12 +598,12 @@ 
      */
     private function quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         } else {
-            return "'" . str_replace("'", "''", $literal) . "'";
+            return "'".str_replace("'", "''", $literal)."'";
         }
     }
 
@@ -618,7 +618,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**

lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php

Doc Comments +1 added lines

@@ -45,6 +45,7 @@
      * {@inheritDoc}
      *
      * @param MultiGetCache $cache
+     * @param string $name
      */
     public function __construct($name, MultiGetCache $cache, $lifetime = 0)
     {

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Region;