Failed Conditions
Pull Request — master (#6735)
by Matthias
09:54
created
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6443Test.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         $entity     = new GH6443Post();
32 32
         $entity->id = 'Foo';
33 33
 
34
-        $dql = 'SELECT p FROM ' . GH6443Post::class . ' p WHERE p = ?1';
34
+        $dql = 'SELECT p FROM '.GH6443Post::class.' p WHERE p = ?1';
35 35
         $query = $this->em->createQuery($dql);
36 36
 
37 37
         // we do not know that the internal type is a rot13, so we can not add the type parameter here
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         $metadata    = $this->em->getClassMetadata(GH6443Post::class);
59 59
         $entityProxy = $this->em->getProxyFactory()->getProxy($metadata, ['id' => 'Foo']);
60 60
 
61
-        $dql = 'SELECT p FROM ' . GH6443Post::class . ' p WHERE p = ?1';
61
+        $dql = 'SELECT p FROM '.GH6443Post::class.' p WHERE p = ?1';
62 62
         $query = $this->em->createQuery($dql);
63 63
 
64 64
         // we do not know that the internal type is a rot13, so we can not add the type parameter here
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
         $entity->id       = 'Foo';
89 89
         $entity->secondId = 'Bar';
90 90
 
91
-        $dql = 'SELECT entity FROM ' . GH6443CombinedIdentityEntity::class . ' entity WHERE entity = ?1';
91
+        $dql = 'SELECT entity FROM '.GH6443CombinedIdentityEntity::class.' entity WHERE entity = ?1';
92 92
         $query = $this->em->createQuery($dql);
93 93
 
94 94
         // we set the entity as arameter
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
         // Check query cache.
235 235
         $queryCache = $this->getQueryCacheDriver();
236
-        if (! ($this->useQueryCache && $queryCache)) {
236
+        if ( ! ($this->useQueryCache && $queryCache)) {
237 237
             $parser = new Parser($this);
238 238
 
239 239
             $this->parserResult = $parser->parse();
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
             $rsm   = $this->getResultSetMapping();
372 372
             $type  = null;
373 373
 
374
-            if (! isset($paramMappings[$key])) {
374
+            if ( ! isset($paramMappings[$key])) {
375 375
                 throw QueryException::unknownParameter($key);
376 376
             }
377 377
 
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 
394 394
             $value = $this->processParameterValue($value);
395 395
             if ($type === null) {
396
-                $type  = $parameter->getValue() === $value
396
+                $type = $parameter->getValue() === $value
397 397
                     ? $parameter->getType()
398 398
                     : ParameterTypeInferer::inferType($value);
399 399
             }
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
     public function setLockMode($lockMode)
690 690
     {
691 691
         if (in_array($lockMode, [LockMode::NONE, LockMode::PESSIMISTIC_READ, LockMode::PESSIMISTIC_WRITE], true)) {
692
-            if (! $this->em->getConnection()->isTransactionActive()) {
692
+            if ( ! $this->em->getConnection()->isTransactionActive()) {
693 693
                 throw TransactionRequiredException::transactionRequired();
694 694
             }
695 695
         }
@@ -730,11 +730,11 @@  discard block
 block discarded – undo
730 730
             ->getName();
731 731
 
732 732
         return md5(
733
-            $this->getDQL() . serialize($this->hints) .
734
-            '&platform=' . $platform .
735
-            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '') .
736
-            '&firstResult=' . $this->firstResult . '&maxResult=' . $this->maxResults .
737
-            '&hydrationMode=' . $this->hydrationMode . '&types=' . serialize($this->parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
733
+            $this->getDQL().serialize($this->hints).
734
+            '&platform='.$platform.
735
+            ($this->em->hasFilters() ? $this->em->getFilters()->getHash() : '').
736
+            '&firstResult='.$this->firstResult.'&maxResult='.$this->maxResults.
737
+            '&hydrationMode='.$this->hydrationMode.'&types='.serialize($this->parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
738 738
         );
739 739
     }
740 740
 
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
      */
744 744
     protected function getHash()
745 745
     {
746
-        return sha1(parent::getHash() . '-' . $this->firstResult . '-' . $this->maxResults);
746
+        return sha1(parent::getHash().'-'.$this->firstResult.'-'.$this->maxResults);
747 747
     }
748 748
 
749 749
     /**
Please login to merge, or discard this patch.