Completed
Pull Request — master (#888)
by Robert
02:44
created
src/JMS/Serializer/XmlDeserializationVisitor.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -346,7 +346,6 @@
 block discarded – undo
346 346
     /**
347 347
      * Retrieves internalSubset even in bugfixed php versions
348 348
      *
349
-     * @param \DOMDocumentType $child
350 349
      * @param string $data
351 350
      * @return string
352 351
      */
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 
69 69
         if (false !== stripos($data, '<!doctype')) {
70 70
             $internalSubset = $this->getDomDocumentTypeEntitySubset($data);
71
-            if (!in_array($internalSubset, $this->doctypeWhitelist, true)) {
71
+            if ( ! in_array($internalSubset, $this->doctypeWhitelist, true)) {
72 72
                 throw new InvalidArgumentException(sprintf(
73 73
                     'The document type "%s" is not allowed. If it is safe, you may add it to the whitelist configuration.',
74 74
                     $internalSubset
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 
91 91
     private function emptyStringToSpaceCharacter($data)
92 92
     {
93
-        return $data === '' ? ' ' : (string)$data;
93
+        return $data === '' ? ' ' : (string) $data;
94 94
     }
95 95
 
96 96
     public function visitNull($data, array $type, Context $context)
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
     public function visitString($data, array $type, Context $context)
102 102
     {
103
-        $data = (string)$data;
103
+        $data = (string) $data;
104 104
 
105 105
         if (null === $this->result) {
106 106
             $this->result = $data;
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
     public function visitBoolean($data, array $type, Context $context)
113 113
     {
114
-        $data = (string)$data;
114
+        $data = (string) $data;
115 115
 
116 116
         if ('true' === $data || '1' === $data) {
117 117
             $data = true;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 
131 131
     public function visitInteger($data, array $type, Context $context)
132 132
     {
133
-        $data = (integer)$data;
133
+        $data = (integer) $data;
134 134
 
135 135
         if (null === $this->result) {
136 136
             $this->result = $data;
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
     public function visitDouble($data, array $type, Context $context)
143 143
     {
144
-        $data = (double)$data;
144
+        $data = (double) $data;
145 145
 
146 146
         if (null === $this->result) {
147 147
             $this->result = $data;
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
             $nodes = $data->xpath($entryName);
193 193
         }
194 194
 
195
-        if (!\count($nodes)) {
195
+        if ( ! \count($nodes)) {
196 196
             if (null === $this->result) {
197 197
                 return $this->result = array();
198 198
             }
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                 $nodes = $data->children($namespace)->$entryName;
232 232
                 foreach ($nodes as $v) {
233 233
                     $attrs = $v->attributes();
234
-                    if (!isset($attrs[$this->currentMetadata->xmlKeyAttribute])) {
234
+                    if ( ! isset($attrs[$this->currentMetadata->xmlKeyAttribute])) {
235 235
                         throw new RuntimeException(sprintf('The key attribute "%s" must be set for each entry of the map.', $this->currentMetadata->xmlKeyAttribute));
236 236
                     }
237 237
 
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
             $name = $this->namingStrategy->translateName($metadata);
264 264
         }
265 265
 
266
-        if (!$metadata->type) {
266
+        if ( ! $metadata->type) {
267 267
             throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $metadata->reflection->class, $metadata->name));
268 268
         }
269 269
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 
288 288
         if ($metadata->xmlCollection) {
289 289
             $enclosingElem = $data;
290
-            if (!$metadata->xmlCollectionInline) {
290
+            if ( ! $metadata->xmlCollectionInline) {
291 291
                 $enclosingElem = $data->children($metadata->xmlNamespace)->$name;
292 292
             }
293 293
 
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
         if ($metadata->xmlNamespace) {
303 303
             $node = $data->children($metadata->xmlNamespace)->$name;
304
-            if (!$node->count()) {
304
+            if ( ! $node->count()) {
305 305
                 return;
306 306
             }
307 307
         } else {
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
             if (isset($namespaces[''])) {
312 312
                 $prefix = uniqid('ns-');
313 313
                 $data->registerXPathNamespace($prefix, $namespaces['']);
314
-                $nodes = $data->xpath('./' . $prefix . ':' . $name);
314
+                $nodes = $data->xpath('./'.$prefix.':'.$name);
315 315
             } else {
316
-                $nodes = $data->xpath('./' . $name);
316
+                $nodes = $data->xpath('./'.$name);
317 317
             }
318 318
             if (empty($nodes)) {
319 319
                 return;
Please login to merge, or discard this patch.
EventDispatcher/Subscriber/SymfonyValidatorValidatorSubscriber.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
             ? null
57 57
             : $context->attributes->get('validation_groups')->get();
58 58
 
59
-        if (!$groups) {
59
+        if ( ! $groups) {
60 60
             return;
61 61
         }
62 62
 
Please login to merge, or discard this patch.
src/JMS/Serializer/Annotation/VirtualProperty.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         }
39 39
 
40 40
         foreach ($data as $key => $value) {
41
-            if (!property_exists(__CLASS__, $key)) {
41
+            if ( ! property_exists(__CLASS__, $key)) {
42 42
                 throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, __CLASS__));
43 43
             }
44 44
             $this->{$key} = $value;
Please login to merge, or discard this patch.
src/JMS/Serializer/Handler/StdClassHandler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
         $classMetadata = $context->getMetadataFactory()->getMetadataForClass('stdClass');
51 51
         $visitor->startVisitingObject($classMetadata, $stdClass, array('name' => 'stdClass'), $context);
52 52
 
53
-        foreach ((array)$stdClass as $name => $value) {
53
+        foreach ((array) $stdClass as $name => $value) {
54 54
             $metadata = new StaticPropertyMetadata('stdClass', $name, $value);
55 55
             $visitor->visitProperty($metadata, $value, $context);
56 56
         }
Please login to merge, or discard this patch.
src/JMS/Serializer/XmlSerializationVisitor.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -127,6 +127,9 @@  discard block
 block discarded – undo
127 127
         return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data);
128 128
     }
129 129
 
130
+    /**
131
+     * @param string $data
132
+     */
130 133
     public function visitSimpleString($data, array $type, Context $context)
131 134
     {
132 135
         if (null === $this->document) {
@@ -474,6 +477,9 @@  discard block
 block discarded – undo
474 477
         return $this->document->createElementNS($namespace, $prefix . ':' . $tagName);
475 478
     }
476 479
 
480
+    /**
481
+     * @param string $value
482
+     */
477 483
     private function setAttributeOnNode(\DOMElement $node, $name, $value, $namespace = null)
478 484
     {
479 485
         if (null !== $namespace) {
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -125,24 +125,24 @@  discard block
 block discarded – undo
125 125
 
126 126
         if (null === $this->document) {
127 127
             $this->document = $this->createDocument(null, null, true);
128
-            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data));
128
+            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data));
129 129
 
130 130
             return;
131 131
         }
132 132
 
133
-        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data);
133
+        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data);
134 134
     }
135 135
 
136 136
     public function visitSimpleString($data, array $type, Context $context)
137 137
     {
138 138
         if (null === $this->document) {
139 139
             $this->document = $this->createDocument(null, null, true);
140
-            $this->currentNode->appendChild($this->document->createTextNode((string)$data));
140
+            $this->currentNode->appendChild($this->document->createTextNode((string) $data));
141 141
 
142 142
             return;
143 143
         }
144 144
 
145
-        return $this->document->createTextNode((string)$data);
145
+        return $this->document->createTextNode((string) $data);
146 146
     }
147 147
 
148 148
     public function visitBoolean($data, array $type, Context $context)
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
             $this->setCurrentNode($entryNode);
191 191
 
192 192
             if (null !== $keyAttributeName) {
193
-                $entryNode->setAttribute($keyAttributeName, (string)$k);
193
+                $entryNode->setAttribute($keyAttributeName, (string) $k);
194 194
             }
195 195
 
196 196
             if (null !== $node = $this->navigator->accept($v, $this->getElementType($type), $context)) {
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
             $node = $this->navigator->accept($v, $metadata->type, $context);
243 243
             $this->revertCurrentMetadata();
244 244
 
245
-            if (!$node instanceof \DOMCharacterData) {
245
+            if ( ! $node instanceof \DOMCharacterData) {
246 246
                 throw new RuntimeException(sprintf('Unsupported value for XML attribute for %s. Expected character data, but got %s.', $metadata->name, json_encode($v)));
247 247
             }
248 248
             if ($this->namingStrategy instanceof AdvancedNamingStrategyInterface) {
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         }
257 257
 
258 258
         if (($metadata->xmlValue && $this->currentNode->childNodes->length > 0)
259
-            || (!$metadata->xmlValue && $this->hasValue)
259
+            || ( ! $metadata->xmlValue && $this->hasValue)
260 260
         ) {
261 261
             throw new RuntimeException(sprintf('If you make use of @XmlValue, all other properties in the class must have the @XmlAttribute annotation. Invalid usage detected in class %s.', $metadata->class));
262 262
         }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
             $node = $this->navigator->accept($v, $metadata->type, $context);
269 269
             $this->revertCurrentMetadata();
270 270
 
271
-            if (!$node instanceof \DOMCharacterData) {
271
+            if ( ! $node instanceof \DOMCharacterData) {
272 272
                 throw new RuntimeException(sprintf('Unsupported value for property %s::$%s. Expected character data, but got %s.', $metadata->reflection->class, $metadata->reflection->name, \is_object($node) ? \get_class($node) : \gettype($node)));
273 273
             }
274 274
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
         }
279 279
 
280 280
         if ($metadata->xmlAttributeMap) {
281
-            if (!\is_array($v)) {
281
+            if ( ! \is_array($v)) {
282 282
                 throw new RuntimeException(sprintf('Unsupported value type for XML attribute map. Expected array but got %s.', \gettype($v)));
283 283
             }
284 284
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
                 $node = $this->navigator->accept($value, null, $context);
288 288
                 $this->revertCurrentMetadata();
289 289
 
290
-                if (!$node instanceof \DOMCharacterData) {
290
+                if ( ! $node instanceof \DOMCharacterData) {
291 291
                     throw new RuntimeException(sprintf('Unsupported value for a XML attribute map value. Expected character data, but got %s.', json_encode($v)));
292 292
                 }
293 293
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
             return;
298 298
         }
299 299
 
300
-        if ($addEnclosingElement = !$this->isInLineCollection($metadata) && !$metadata->inline) {
300
+        if ($addEnclosingElement = ! $this->isInLineCollection($metadata) && ! $metadata->inline) {
301 301
             if ($this->namingStrategy instanceof AdvancedNamingStrategyInterface) {
302 302
                 $elementName = $this->namingStrategy->getPropertyName($metadata, $context);
303 303
             } else {
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 
345 345
     private function isSkippableEmptyObject($node, PropertyMetadata $metadata)
346 346
     {
347
-        return $node === null && !$metadata->xmlCollection && $metadata->skipWhenEmpty;
347
+        return $node === null && ! $metadata->xmlCollection && $metadata->skipWhenEmpty;
348 348
     }
349 349
 
350 350
     private function isSkippableCollection(PropertyMetadata $metadata)
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
354 354
 
355 355
     private function isElementEmpty(\DOMElement $element)
356 356
     {
357
-        return !$element->hasChildNodes() && !$element->hasAttributes();
357
+        return ! $element->hasChildNodes() && ! $element->hasAttributes();
358 358
     }
359 359
 
360 360
     public function endVisitingObject(ClassMetadata $metadata, $data, array $type, Context $context)
@@ -433,12 +433,12 @@  discard block
 block discarded – undo
433 433
     {
434 434
         if (null === $this->document) {
435 435
             $this->document = $this->createDocument(null, null, true);
436
-            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string)$data));
436
+            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string) $data));
437 437
 
438 438
             return $textNode;
439 439
         }
440 440
 
441
-        return $this->document->createTextNode((string)$data);
441
+        return $this->document->createTextNode((string) $data);
442 442
     }
443 443
 
444 444
     /**
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 
456 456
     private function attachNullNamespace()
457 457
     {
458
-        if (!$this->nullWasVisited) {
458
+        if ( ! $this->nullWasVisited) {
459 459
             $this->document->documentElement->setAttributeNS(
460 460
                 'http://www.w3.org/2000/xmlns/',
461 461
                 'xmlns:xsi',
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
         foreach ($metadata->xmlNamespaces as $prefix => $uri) {
477 477
             $attribute = 'xmlns';
478 478
             if ($prefix !== '') {
479
-                $attribute .= ':' . $prefix;
479
+                $attribute .= ':'.$prefix;
480 480
             } elseif ($element->namespaceURI === $uri) {
481 481
                 continue;
482 482
             }
@@ -492,19 +492,19 @@  discard block
 block discarded – undo
492 492
         if ($this->currentNode->isDefaultNamespace($namespace)) {
493 493
             return $this->document->createElementNS($namespace, $tagName);
494 494
         }
495
-        if (!($prefix = $this->currentNode->lookupPrefix($namespace)) && !($prefix = $this->document->lookupPrefix($namespace))) {
496
-            $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
495
+        if ( ! ($prefix = $this->currentNode->lookupPrefix($namespace)) && ! ($prefix = $this->document->lookupPrefix($namespace))) {
496
+            $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
497 497
         }
498
-        return $this->document->createElementNS($namespace, $prefix . ':' . $tagName);
498
+        return $this->document->createElementNS($namespace, $prefix.':'.$tagName);
499 499
     }
500 500
 
501 501
     private function setAttributeOnNode(\DOMElement $node, $name, $value, $namespace = null)
502 502
     {
503 503
         if (null !== $namespace) {
504
-            if (!$prefix = $node->lookupPrefix($namespace)) {
505
-                $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
504
+            if ( ! $prefix = $node->lookupPrefix($namespace)) {
505
+                $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
506 506
             }
507
-            $node->setAttributeNS($namespace, $prefix . ':' . $name, $value);
507
+            $node->setAttributeNS($namespace, $prefix.':'.$name, $value);
508 508
         } else {
509 509
             $node->setAttribute($name, $value);
510 510
         }
@@ -528,6 +528,6 @@  discard block
 block discarded – undo
528 528
      */
529 529
     public function setFormatOutput($formatOutput)
530 530
     {
531
-        $this->formatOutput = (boolean)$formatOutput;
531
+        $this->formatOutput = (boolean) $formatOutput;
532 532
     }
533 533
 }
Please login to merge, or discard this patch.
src/JMS/Serializer/Handler/PhpCollectionHandler.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,14 +41,14 @@
 block discarded – undo
41 41
                     'direction' => GraphNavigator::DIRECTION_SERIALIZATION,
42 42
                     'type' => $type,
43 43
                     'format' => $format,
44
-                    'method' => 'serialize' . $shortName,
44
+                    'method' => 'serialize'.$shortName,
45 45
                 );
46 46
 
47 47
                 $methods[] = array(
48 48
                     'direction' => GraphNavigator::DIRECTION_DESERIALIZATION,
49 49
                     'type' => $type,
50 50
                     'format' => $format,
51
-                    'method' => 'deserialize' . $shortName,
51
+                    'method' => 'deserialize'.$shortName,
52 52
                 );
53 53
             }
54 54
         }
Please login to merge, or discard this patch.
src/JMS/Serializer/Handler/ConstraintViolationHandler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
                     'direction' => GraphNavigator::DIRECTION_SERIALIZATION,
41 41
                     'type' => $type,
42 42
                     'format' => $format,
43
-                    'method' => $method . 'To' . $format,
43
+                    'method' => $method.'To'.$format,
44 44
                 );
45 45
             }
46 46
         }
Please login to merge, or discard this patch.
src/JMS/Serializer/Handler/DateHandler.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
                     'type' => $type,
54 54
                     'format' => $format,
55 55
                     'direction' => GraphNavigator::DIRECTION_SERIALIZATION,
56
-                    'method' => 'serialize' . $type,
56
+                    'method' => 'serialize'.$type,
57 57
                 );
58 58
             }
59 59
         }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
     private function isDataXmlNull($data)
117 117
     {
118 118
         $attributes = $data->attributes('xsi', true);
119
-        return isset($attributes['nil'][0]) && (string)$attributes['nil'][0] === 'true';
119
+        return isset($attributes['nil'][0]) && (string) $attributes['nil'][0] === 'true';
120 120
     }
121 121
 
122 122
     public function deserializeDateTimeFromXml(XmlDeserializationVisitor $visitor, $data, array $type)
@@ -175,13 +175,13 @@  discard block
 block discarded – undo
175 175
 
176 176
     private function parseDateTime($data, array $type, $immutable = false)
177 177
     {
178
-        $timezone = !empty($type['params'][1]) ? new \DateTimeZone($type['params'][1]) : $this->defaultTimezone;
178
+        $timezone = ! empty($type['params'][1]) ? new \DateTimeZone($type['params'][1]) : $this->defaultTimezone;
179 179
         $format = $this->getDeserializationFormat($type);
180 180
 
181 181
         if ($immutable) {
182
-            $datetime = \DateTimeImmutable::createFromFormat($format, (string)$data, $timezone);
182
+            $datetime = \DateTimeImmutable::createFromFormat($format, (string) $data, $timezone);
183 183
         } else {
184
-            $datetime = \DateTime::createFromFormat($format, (string)$data, $timezone);
184
+            $datetime = \DateTime::createFromFormat($format, (string) $data, $timezone);
185 185
         }
186 186
 
187 187
         if (false === $datetime) {
@@ -236,15 +236,15 @@  discard block
 block discarded – undo
236 236
         $format = 'P';
237 237
 
238 238
         if (0 < $dateInterval->y) {
239
-            $format .= $dateInterval->y . 'Y';
239
+            $format .= $dateInterval->y.'Y';
240 240
         }
241 241
 
242 242
         if (0 < $dateInterval->m) {
243
-            $format .= $dateInterval->m . 'M';
243
+            $format .= $dateInterval->m.'M';
244 244
         }
245 245
 
246 246
         if (0 < $dateInterval->d) {
247
-            $format .= $dateInterval->d . 'D';
247
+            $format .= $dateInterval->d.'D';
248 248
         }
249 249
 
250 250
         if (0 < $dateInterval->h || 0 < $dateInterval->i || 0 < $dateInterval->s) {
@@ -252,15 +252,15 @@  discard block
 block discarded – undo
252 252
         }
253 253
 
254 254
         if (0 < $dateInterval->h) {
255
-            $format .= $dateInterval->h . 'H';
255
+            $format .= $dateInterval->h.'H';
256 256
         }
257 257
 
258 258
         if (0 < $dateInterval->i) {
259
-            $format .= $dateInterval->i . 'M';
259
+            $format .= $dateInterval->i.'M';
260 260
         }
261 261
 
262 262
         if (0 < $dateInterval->s) {
263
-            $format .= $dateInterval->s . 'S';
263
+            $format .= $dateInterval->s.'S';
264 264
         }
265 265
 
266 266
         if ($format === 'P') {
Please login to merge, or discard this patch.
src/JMS/Serializer/Metadata/Driver/DoctrinePHPCRTypeDriver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         $propertyName = $propertyMetadata->name;
44 44
         if ($doctrineMetadata->hasField($propertyName) && $fieldType = $this->normalizeFieldType($doctrineMetadata->getTypeOfField($propertyName))) {
45 45
             $field = $doctrineMetadata->getFieldMapping($propertyName);
46
-            if (!empty($field['multivalue'])) {
46
+            if ( ! empty($field['multivalue'])) {
47 47
                 $fieldType = 'array';
48 48
             }
49 49
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 return;
60 60
             }
61 61
 
62
-            if (!$doctrineMetadata->isSingleValuedAssociation($propertyName)) {
62
+            if ( ! $doctrineMetadata->isSingleValuedAssociation($propertyName)) {
63 63
                 $targetEntity = "ArrayCollection<{$targetEntity}>";
64 64
             }
65 65
 
Please login to merge, or discard this patch.