Completed
Pull Request — 2.6 (#8015)
by
unknown
06:46
created
lib/Doctrine/ORM/EntityManager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
225 225
      */
226 226
     public function transactional($func)
227 227
     {
228
-        if (!is_callable($func)) {
229
-            throw new \InvalidArgumentException('Expected argument of type "callable", got "' . gettype($func) . '"');
228
+        if ( ! is_callable($func)) {
229
+            throw new \InvalidArgumentException('Expected argument of type "callable", got "'.gettype($func).'"');
230 230
         }
231 231
 
232 232
         $this->conn->beginTransaction();
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
      */
763 763
     public function isOpen()
764 764
     {
765
-        return (!$this->closed);
765
+        return ( ! $this->closed);
766 766
     }
767 767
 
768 768
     /**
@@ -873,7 +873,7 @@  discard block
 block discarded – undo
873 873
                 sprintf(
874 874
                     'Invalid $connection argument of type %s given%s.',
875 875
                     is_object($connection) ? get_class($connection) : gettype($connection),
876
-                    is_object($connection) ? '' : ': "' . $connection . '"'
876
+                    is_object($connection) ? '' : ': "'.$connection.'"'
877 877
                 )
878 878
             );
879 879
         }
@@ -923,13 +923,13 @@  discard block
 block discarded – undo
923 923
     {
924 924
         switch ($lockMode) {
925 925
             case LockMode::OPTIMISTIC:
926
-                if (!$class->isVersioned) {
926
+                if ( ! $class->isVersioned) {
927 927
                     throw OptimisticLockException::notVersioned($class->name);
928 928
                 }
929 929
                 break;
930 930
             case LockMode::PESSIMISTIC_READ:
931 931
             case LockMode::PESSIMISTIC_WRITE:
932
-                if (!$this->getConnection()->isTransactionActive()) {
932
+                if ( ! $this->getConnection()->isTransactionActive()) {
933 933
                     throw TransactionRequiredException::transactionRequired();
934 934
                 }
935 935
         }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function exportClassMetadata(ClassMetadataInfo $metadata)
43 43
     {
44
-        $xml = new SimpleXmlElement('<?xml version="1.0" encoding="utf-8"?><doctrine-mapping ' .
45
-            'xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" ' .
46
-            'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
44
+        $xml = new SimpleXmlElement('<?xml version="1.0" encoding="utf-8"?><doctrine-mapping '.
45
+            'xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" '.
46
+            'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" '.
47 47
             'xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd" />');
48 48
 
49 49
         if ($metadata->isMappedSuperclass) {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
100 100
 
101
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
101
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
102 102
             $root->addChild('change-tracking-policy', $trackingPolicy);
103 103
         }
104 104
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
             }
298 298
 
299 299
             if (count($cascade) === 5) {
300
-                $cascade  = ['cascade-all'];
300
+                $cascade = ['cascade-all'];
301 301
             }
302 302
 
303 303
             if ($cascade) {
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
             }
380 380
         }
381 381
 
382
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
382
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
383 383
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
384 384
 
385 385
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
     {
431 431
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
432 432
 
433
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
433
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
434 434
             return;
435 435
         }
436 436
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityManagerInterface.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -242,17 +242,17 @@
 block discarded – undo
242 242
     public function getUnitOfWork();
243 243
 
244 244
     /**
245
-    * Gets a hydrator for the given hydration mode.
246
-    *
247
-    * This method caches the hydrator instances which is used for all queries that don't
248
-    * selectively iterate over the result.
249
-    *
250
-    * @deprecated
251
-    *
252
-    * @param string|int $hydrationMode
253
-    *
254
-    * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
255
-    */
245
+     * Gets a hydrator for the given hydration mode.
246
+     *
247
+     * This method caches the hydrator instances which is used for all queries that don't
248
+     * selectively iterate over the result.
249
+     *
250
+     * @deprecated
251
+     *
252
+     * @param string|int $hydrationMode
253
+     *
254
+     * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
255
+     */
256 256
     public function getHydrator($hydrationMode);
257 257
 
258 258
     /**
Please login to merge, or discard this patch.
tests/Doctrine/Performance/Query/QueryBoundParameterProcessingBench.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,8 @@
 block discarded – undo
57 57
         $this->parsedQueryWithDeclaredParameterType = $entityManager->createQuery($dql);
58 58
 
59 59
         foreach (range(1, 10) as $index) {
60
-            $this->parsedQueryWithInferredParameterType->setParameter('parameter' . $index, new DateTime());
61
-            $this->parsedQueryWithDeclaredParameterType->setParameter('parameter' . $index, new DateTime(), DateTimeType::DATETIME);
60
+            $this->parsedQueryWithInferredParameterType->setParameter('parameter'.$index, new DateTime());
61
+            $this->parsedQueryWithDeclaredParameterType->setParameter('parameter'.$index, new DateTime(), DateTimeType::DATETIME);
62 62
         }
63 63
 
64 64
         // Force parsing upfront - we don't benchmark that bit in this scenario
Please login to merge, or discard this patch.
tests/Doctrine/Performance/EntityManagerFactory.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,12 +19,12 @@  discard block
 block discarded – undo
19 19
     {
20 20
         $config = new Configuration();
21 21
 
22
-        $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
22
+        $config->setProxyDir(__DIR__.'/../Tests/Proxies');
23 23
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
24 24
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
25 25
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([
26
-            realpath(__DIR__ . '/Models/Cache'),
27
-            realpath(__DIR__ . '/Models/GeoNames'),
26
+            realpath(__DIR__.'/Models/Cache'),
27
+            realpath(__DIR__.'/Models/GeoNames'),
28 28
         ], true));
29 29
 
30 30
         $entityManager = EntityManager::create(
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
     {
46 46
         $config = new Configuration();
47 47
 
48
-        $config->setProxyDir(__DIR__ . '/../Tests/Proxies');
48
+        $config->setProxyDir(__DIR__.'/../Tests/Proxies');
49 49
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
50 50
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
51 51
         $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver([
52
-            realpath(__DIR__ . '/Models/Cache'),
53
-            realpath(__DIR__ . '/Models/Generic'),
54
-            realpath(__DIR__ . '/Models/GeoNames'),
52
+            realpath(__DIR__.'/Models/Cache'),
53
+            realpath(__DIR__.'/Models/Generic'),
54
+            realpath(__DIR__.'/Models/GeoNames'),
55 55
         ], true));
56 56
 
57 57
         // A connection that doesn't really do anything
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/QueryExpressionVisitor.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
             $expressionList[] = $this->dispatch($child);
115 115
         }
116 116
 
117
-        switch($expr->getType()) {
117
+        switch ($expr->getType()) {
118 118
             case CompositeExpression::TYPE_AND:
119 119
                 return new Expr\Andx($expressionList);
120 120
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                 return new Expr\Orx($expressionList);
123 123
 
124 124
             default:
125
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
125
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
126 126
         }
127 127
     }
128 128
 
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
             throw new QueryException('No aliases are set before invoking walkComparison().');
137 137
         }
138 138
 
139
-        $field = $this->queryAliases[0] . '.' . $comparison->getField();
139
+        $field = $this->queryAliases[0].'.'.$comparison->getField();
140 140
 
141
-        foreach($this->queryAliases as $alias) {
142
-            if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
141
+        foreach ($this->queryAliases as $alias) {
142
+            if (strpos($comparison->getField().'.', $alias.'.') === 0) {
143 143
                 $field = $comparison->getField();
144 144
                 break;
145 145
             }
@@ -149,13 +149,13 @@  discard block
 block discarded – undo
149 149
 
150 150
         foreach ($this->parameters as $parameter) {
151 151
             if ($parameter->getName() === $parameterName) {
152
-                $parameterName .= '_' . count($this->parameters);
152
+                $parameterName .= '_'.count($this->parameters);
153 153
                 break;
154 154
             }
155 155
         }
156 156
 
157 157
         $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue()));
158
-        $placeholder = ':' . $parameterName;
158
+        $placeholder = ':'.$parameterName;
159 159
 
160 160
         switch ($comparison->getOperator()) {
161 161
             case Comparison::IN:
@@ -182,19 +182,19 @@  discard block
 block discarded – undo
182 182
 
183 183
                 return $this->expr->neq($field, $placeholder);
184 184
             case Comparison::CONTAINS:
185
-                $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
185
+                $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType());
186 186
                 $this->parameters[] = $parameter;
187 187
 
188 188
                 return $this->expr->like($field, $placeholder);
189 189
             case Comparison::MEMBER_OF:
190 190
                 return $this->expr->isMemberOf($comparison->getField(), $comparison->getValue()->getValue());
191 191
             case Comparison::STARTS_WITH:
192
-                $parameter->setValue($parameter->getValue() . '%', $parameter->getType());
192
+                $parameter->setValue($parameter->getValue().'%', $parameter->getType());
193 193
                 $this->parameters[] = $parameter;
194 194
 
195 195
                 return $this->expr->like($field, $placeholder);
196 196
             case Comparison::ENDS_WITH:
197
-                $parameter->setValue('%' . $parameter->getValue(), $parameter->getType());
197
+                $parameter->setValue('%'.$parameter->getValue(), $parameter->getType());
198 198
                 $this->parameters[] = $parameter;
199 199
 
200 200
                 return $this->expr->like($field, $placeholder);
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
                     );
211 211
                 }
212 212
 
213
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
213
+                throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator());
214 214
         }
215 215
     }
216 216
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
      */
106 106
     protected function onNotFoundMetadata($className)
107 107
     {
108
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
108
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
109 109
             return;
110 110
         }
111 111
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
             $this->completeIdGeneratorMapping($class);
163 163
         }
164 164
 
165
-        if (!$class->isMappedSuperclass) {
165
+        if ( ! $class->isMappedSuperclass) {
166 166
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
167 167
 
168 168
                 if (isset($embeddableClass['inherited'])) {
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
                 $identifier = $embeddableMetadata->getIdentifier();
189 189
 
190
-                if (! empty($identifier)) {
190
+                if ( ! empty($identifier)) {
191 191
                     $this->inheritIdGeneratorMapping($class, $embeddableMetadata);
192 192
                 }
193 193
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
      */
258 258
     protected function validateRuntimeMetadata($class, $parent)
259 259
     {
260
-        if ( ! $class->reflClass ) {
260
+        if ( ! $class->reflClass) {
261 261
             // only validate if there is a reflection class instance
262 262
             return;
263 263
         }
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
         $class->validateLifecycleCallbacks($this->getReflectionService());
268 268
 
269 269
         // verify inheritance
270
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
270
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
271 271
             if ( ! $parent) {
272 272
                 if (count($class->discriminatorMap) == 0) {
273 273
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
     {
429 429
         foreach ($parentClass->associationMappings as $field => $mapping) {
430 430
             if ($parentClass->isMappedSuperclass) {
431
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
431
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
432 432
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
433 433
                 }
434 434
                 $mapping['sourceEntity'] = $subClass->name;
@@ -477,11 +477,11 @@  discard block
 block discarded – undo
477 477
 
478 478
             $parentClass->mapEmbedded(
479 479
                 [
480
-                    'fieldName' => $prefix . '.' . $property,
480
+                    'fieldName' => $prefix.'.'.$property,
481 481
                     'class' => $embeddableMetadata->name,
482 482
                     'columnPrefix' => $embeddableClass['columnPrefix'],
483 483
                     'declaredField' => $embeddableClass['declaredField']
484
-                            ? $prefix . '.' . $embeddableClass['declaredField']
484
+                            ? $prefix.'.'.$embeddableClass['declaredField']
485 485
                             : $prefix,
486 486
                     'originalField' => $embeddableClass['originalField'] ?: $property,
487 487
                 ]
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
      */
500 500
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
501 501
     {
502
-        if (! $parentClass->isMappedSuperclass) {
502
+        if ( ! $parentClass->isMappedSuperclass) {
503 503
             return;
504 504
         }
505 505
 
@@ -707,14 +707,14 @@  discard block
 block discarded – undo
707 707
                     throw new ORMException("Can't instantiate custom generator : no custom generator definition");
708 708
                 }
709 709
                 if ( ! class_exists($definition['class'])) {
710
-                    throw new ORMException("Can't instantiate custom generator : " .
710
+                    throw new ORMException("Can't instantiate custom generator : ".
711 711
                         $definition['class']);
712 712
                 }
713 713
                 $class->setIdGenerator(new $definition['class']);
714 714
                 break;
715 715
 
716 716
             default:
717
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
717
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
718 718
         }
719 719
     }
720 720
 
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
      */
765 765
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
766 766
     {
767
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
767
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
768 768
     }
769 769
 
770 770
     /**
@@ -788,7 +788,7 @@  discard block
 block discarded – undo
788 788
      */
789 789
     private function getTargetPlatform()
790 790
     {
791
-        if (!$this->targetPlatform) {
791
+        if ( ! $this->targetPlatform) {
792 792
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
793 793
         }
794 794
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
         $returnableItems = [];
71 71
 
72 72
         foreach ($keysToRetrieve as $index => $key) {
73
-            if (! $items[$key] instanceof CacheEntry) {
73
+            if ( ! $items[$key] instanceof CacheEntry) {
74 74
                 return null;
75 75
             }
76 76
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Region/DefaultRegion.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $entry = $this->cache->fetch($this->getCacheEntryKey($key));
98 98
 
99
-        if (! $entry instanceof CacheEntry) {
99
+        if ( ! $entry instanceof CacheEntry) {
100 100
             return null;
101 101
         }
102 102
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
             $entryKey   = $this->getCacheEntryKey($key);
115 115
             $entryValue = $this->cache->fetch($entryKey);
116 116
 
117
-            if (! $entryValue instanceof CacheEntry) {
117
+            if ( ! $entryValue instanceof CacheEntry) {
118 118
                 return null;
119 119
             }
120 120
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
      */
131 131
     protected function getCacheEntryKey(CacheKey $key)
132 132
     {
133
-        return $this->name . self::REGION_KEY_SEPARATOR . $key->hash;
133
+        return $this->name.self::REGION_KEY_SEPARATOR.$key->hash;
134 134
     }
135 135
 
136 136
     /**
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
      */
155 155
     public function evictAll()
156 156
     {
157
-        if (! $this->cache instanceof ClearableCache) {
157
+        if ( ! $this->cache instanceof ClearableCache) {
158 158
             throw new \BadMethodCallException(sprintf(
159 159
                 'Clearing all cache entries is not supported by the supplied cache adapter of type %s',
160 160
                 get_class($this->cache)
Please login to merge, or discard this patch.