Completed
Pull Request — 2.6 (#7737)
by
unknown
07:52
created
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.
lib/Doctrine/ORM/Tools/SchemaTool.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
                             $targetEntity = current(
226 226
                                 array_filter(
227 227
                                     $classes,
228
-                                    function (ClassMetadata $class) use ($idMapping) : bool {
228
+                                    function(ClassMetadata $class) use ($idMapping) : bool {
229 229
                                         return $class->name === $idMapping['targetEntity'];
230 230
                                     }
231 231
                                 )
@@ -645,8 +645,8 @@  discard block
 block discarded – undo
645 645
 
646 646
             if ( ! $definingClass) {
647 647
                 throw new \Doctrine\ORM\ORMException(
648
-                    'Column name `' . $joinColumn['referencedColumnName'] . '` referenced for relation from '
649
-                    . $mapping['sourceEntity'] . ' towards ' . $mapping['targetEntity'] . ' does not exist.'
648
+                    'Column name `'.$joinColumn['referencedColumnName'].'` referenced for relation from '
649
+                    . $mapping['sourceEntity'].' towards '.$mapping['targetEntity'].' does not exist.'
650 650
                 );
651 651
             }
652 652
 
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
      */
742 742
     private function gatherColumnOptions(array $mapping) : array
743 743
     {
744
-        if (! isset($mapping['options'])) {
744
+        if ( ! isset($mapping['options'])) {
745 745
             return [];
746 746
         }
747 747
 
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
                 if ($table->hasPrimaryKey()) {
848 848
                     $columns = $table->getPrimaryKey()->getColumns();
849 849
                     if (count($columns) == 1) {
850
-                        $checkSequence = $table->getName() . '_' . $columns[0] . '_seq';
850
+                        $checkSequence = $table->getName().'_'.$columns[0].'_seq';
851 851
                         if ($fullSchema->hasSequence($checkSequence)) {
852 852
                             $visitor->acceptSequence($fullSchema->getSequence($checkSequence));
853 853
                         }
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.