Completed
Pull Request — master (#813)
by Adrián
06:59
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
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
         if (false !== stripos($data, '<!doctype')) {
69 69
             $internalSubset = $this->getDomDocumentTypeEntitySubset($data);
70
-            if (!in_array($internalSubset, $this->doctypeWhitelist, true)) {
70
+            if ( ! in_array($internalSubset, $this->doctypeWhitelist, true)) {
71 71
                 throw new InvalidArgumentException(sprintf(
72 72
                     'The document type "%s" is not allowed. If it is safe, you may add it to the whitelist configuration.',
73 73
                     $internalSubset
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
     private function emptyStringToSpaceCharacter($data)
91 91
     {
92
-        return $data === '' ? ' ' : (string)$data;
92
+        return $data === '' ? ' ' : (string) $data;
93 93
     }
94 94
 
95 95
     public function visitNull($data, array $type, Context $context)
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
     public function visitString($data, array $type, Context $context)
101 101
     {
102
-        $data = (string)$data;
102
+        $data = (string) $data;
103 103
 
104 104
         if (null === $this->result) {
105 105
             $this->result = $data;
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 
111 111
     public function visitBoolean($data, array $type, Context $context)
112 112
     {
113
-        $data = (string)$data;
113
+        $data = (string) $data;
114 114
 
115 115
         if ('true' === $data || '1' === $data) {
116 116
             $data = true;
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
     public function visitInteger($data, array $type, Context $context)
131 131
     {
132
-        $data = (integer)$data;
132
+        $data = (integer) $data;
133 133
 
134 134
         if (null === $this->result) {
135 135
             $this->result = $data;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
     public function visitDouble($data, array $type, Context $context)
142 142
     {
143
-        $data = (double)$data;
143
+        $data = (double) $data;
144 144
 
145 145
         if (null === $this->result) {
146 146
             $this->result = $data;
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             $nodes = $data->xpath($entryName);
168 168
         }
169 169
 
170
-        if (!count($nodes)) {
170
+        if ( ! count($nodes)) {
171 171
             if (null === $this->result) {
172 172
                 return $this->result = array();
173 173
             }
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
                 $nodes = $data->children($namespace)->$entryName;
207 207
                 foreach ($nodes as $v) {
208 208
                     $attrs = $v->attributes();
209
-                    if (!isset($attrs[$this->currentMetadata->xmlKeyAttribute])) {
209
+                    if ( ! isset($attrs[$this->currentMetadata->xmlKeyAttribute])) {
210 210
                         throw new RuntimeException(sprintf('The key attribute "%s" must be set for each entry of the map.', $this->currentMetadata->xmlKeyAttribute));
211 211
                     }
212 212
 
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
     {
235 235
         $name = $this->namingStrategy->translateName($metadata);
236 236
 
237
-        if (!$metadata->type) {
237
+        if ( ! $metadata->type) {
238 238
             throw new RuntimeException(sprintf('You must define a type for %s::$%s.', $metadata->reflection->class, $metadata->name));
239 239
         }
240 240
 
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
 
259 259
         if ($metadata->xmlCollection) {
260 260
             $enclosingElem = $data;
261
-            if (!$metadata->xmlCollectionInline) {
261
+            if ( ! $metadata->xmlCollectionInline) {
262 262
                 $enclosingElem = $data->children($metadata->xmlNamespace)->$name;
263 263
             }
264 264
 
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 
273 273
         if ($metadata->xmlNamespace) {
274 274
             $node = $data->children($metadata->xmlNamespace)->$name;
275
-            if (!$node->count()) {
275
+            if ( ! $node->count()) {
276 276
                 return;
277 277
             }
278 278
         } else {
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
             if (isset($namespaces[''])) {
283 283
                 $prefix = uniqid('ns-');
284 284
                 $data->registerXPathNamespace($prefix, $namespaces['']);
285
-                $nodes = $data->xpath('./' . $prefix . ':' . $name);
285
+                $nodes = $data->xpath('./'.$prefix.':'.$name);
286 286
             } else {
287
-                $nodes = $data->xpath('./' . $name);
287
+                $nodes = $data->xpath('./'.$name);
288 288
             }
289 289
             if (empty($nodes)) {
290 290
                 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/Expression/ExpressionEvaluator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,13 +64,13 @@
 block discarded – undo
64 64
      */
65 65
     public function evaluate($expression, array $data = array())
66 66
     {
67
-        if (!is_string($expression)) {
67
+        if ( ! is_string($expression)) {
68 68
             return $expression;
69 69
         }
70 70
 
71 71
         $context = $data + $this->context;
72 72
 
73
-        if (!array_key_exists($expression, $this->cache)) {
73
+        if ( ! array_key_exists($expression, $this->cache)) {
74 74
             $this->cache[$expression] = $this->expressionLanguage->parse($expression, array_keys($context));
75 75
         }
76 76
 
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/Annotation/SerializedName.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 
31 31
     public function __construct(array $values)
32 32
     {
33
-        if (!isset($values['value']) || !is_string($values['value'])) {
33
+        if ( ! isset($values['value']) || ! is_string($values['value'])) {
34 34
             throw new RuntimeException(sprintf('"value" must be a string.'));
35 35
         }
36 36
 
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
@@ -124,24 +124,24 @@  discard block
 block discarded – undo
124 124
 
125 125
         if (null === $this->document) {
126 126
             $this->document = $this->createDocument(null, null, true);
127
-            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data));
127
+            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data));
128 128
 
129 129
             return;
130 130
         }
131 131
 
132
-        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data);
132
+        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data);
133 133
     }
134 134
 
135 135
     public function visitSimpleString($data, array $type, Context $context)
136 136
     {
137 137
         if (null === $this->document) {
138 138
             $this->document = $this->createDocument(null, null, true);
139
-            $this->currentNode->appendChild($this->document->createTextNode((string)$data));
139
+            $this->currentNode->appendChild($this->document->createTextNode((string) $data));
140 140
 
141 141
             return;
142 142
         }
143 143
 
144
-        return $this->document->createTextNode((string)$data);
144
+        return $this->document->createTextNode((string) $data);
145 145
     }
146 146
 
147 147
     public function visitBoolean($data, array $type, Context $context)
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
             $this->setCurrentNode($entryNode);
190 190
 
191 191
             if (null !== $keyAttributeName) {
192
-                $entryNode->setAttribute($keyAttributeName, (string)$k);
192
+                $entryNode->setAttribute($keyAttributeName, (string) $k);
193 193
             }
194 194
 
195 195
             if (null !== $node = $this->navigator->accept($v, $this->getElementType($type), $context)) {
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
             $node = $this->navigator->accept($v, $metadata->type, $context);
242 242
             $this->revertCurrentMetadata();
243 243
 
244
-            if (!$node instanceof \DOMCharacterData) {
244
+            if ( ! $node instanceof \DOMCharacterData) {
245 245
                 throw new RuntimeException(sprintf('Unsupported value for XML attribute for %s. Expected character data, but got %s.', $metadata->name, json_encode($v)));
246 246
             }
247 247
             $attributeName = $this->namingStrategy->translateName($metadata);
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         }
252 252
 
253 253
         if (($metadata->xmlValue && $this->currentNode->childNodes->length > 0)
254
-            || (!$metadata->xmlValue && $this->hasValue)
254
+            || ( ! $metadata->xmlValue && $this->hasValue)
255 255
         ) {
256 256
             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));
257 257
         }
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
             $node = $this->navigator->accept($v, $metadata->type, $context);
264 264
             $this->revertCurrentMetadata();
265 265
 
266
-            if (!$node instanceof \DOMCharacterData) {
266
+            if ( ! $node instanceof \DOMCharacterData) {
267 267
                 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)));
268 268
             }
269 269
 
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
         }
274 274
 
275 275
         if ($metadata->xmlAttributeMap) {
276
-            if (!is_array($v)) {
276
+            if ( ! is_array($v)) {
277 277
                 throw new RuntimeException(sprintf('Unsupported value type for XML attribute map. Expected array but got %s.', gettype($v)));
278 278
             }
279 279
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                 $node = $this->navigator->accept($value, null, $context);
283 283
                 $this->revertCurrentMetadata();
284 284
 
285
-                if (!$node instanceof \DOMCharacterData) {
285
+                if ( ! $node instanceof \DOMCharacterData) {
286 286
                     throw new RuntimeException(sprintf('Unsupported value for a XML attribute map value. Expected character data, but got %s.', json_encode($v)));
287 287
                 }
288 288
 
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
             return;
293 293
         }
294 294
 
295
-        if ($addEnclosingElement = !$this->isInLineCollection($metadata) && !$metadata->inline) {
295
+        if ($addEnclosingElement = ! $this->isInLineCollection($metadata) && ! $metadata->inline) {
296 296
             $elementName = $this->namingStrategy->translateName($metadata);
297 297
 
298 298
             $namespace = null !== $metadata->xmlNamespace
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 
336 336
     private function isSkippableEmptyObject($node, PropertyMetadata $metadata)
337 337
     {
338
-        return $node === null && !$metadata->xmlCollection && $metadata->skipWhenEmpty;
338
+        return $node === null && ! $metadata->xmlCollection && $metadata->skipWhenEmpty;
339 339
     }
340 340
 
341 341
     private function isSkippableCollection(PropertyMetadata $metadata)
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 
346 346
     private function isElementEmpty(\DOMElement $element)
347 347
     {
348
-        return !$element->hasChildNodes() && !$element->hasAttributes();
348
+        return ! $element->hasChildNodes() && ! $element->hasAttributes();
349 349
     }
350 350
 
351 351
     public function endVisitingObject(ClassMetadata $metadata, $data, array $type, Context $context)
@@ -424,12 +424,12 @@  discard block
 block discarded – undo
424 424
     {
425 425
         if (null === $this->document) {
426 426
             $this->document = $this->createDocument(null, null, true);
427
-            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string)$data));
427
+            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string) $data));
428 428
 
429 429
             return $textNode;
430 430
         }
431 431
 
432
-        return $this->document->createTextNode((string)$data);
432
+        return $this->document->createTextNode((string) $data);
433 433
     }
434 434
 
435 435
     /**
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 
447 447
     private function attachNullNamespace()
448 448
     {
449
-        if (!$this->nullWasVisited) {
449
+        if ( ! $this->nullWasVisited) {
450 450
             $this->document->documentElement->setAttributeNS(
451 451
                 'http://www.w3.org/2000/xmlns/',
452 452
                 'xmlns:xsi',
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
         foreach ($metadata->xmlNamespaces as $prefix => $uri) {
468 468
             $attribute = 'xmlns';
469 469
             if ($prefix !== '') {
470
-                $attribute .= ':' . $prefix;
470
+                $attribute .= ':'.$prefix;
471 471
             } elseif ($element->namespaceURI === $uri) {
472 472
                 continue;
473 473
             }
@@ -483,19 +483,19 @@  discard block
 block discarded – undo
483 483
         if ($this->currentNode->isDefaultNamespace($namespace)) {
484 484
             return $this->document->createElementNS($namespace, $tagName);
485 485
         }
486
-        if (!($prefix = $this->currentNode->lookupPrefix($namespace)) && !($prefix = $this->document->lookupPrefix($namespace))) {
487
-            $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
486
+        if ( ! ($prefix = $this->currentNode->lookupPrefix($namespace)) && ! ($prefix = $this->document->lookupPrefix($namespace))) {
487
+            $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
488 488
         }
489
-        return $this->document->createElementNS($namespace, $prefix . ':' . $tagName);
489
+        return $this->document->createElementNS($namespace, $prefix.':'.$tagName);
490 490
     }
491 491
 
492 492
     private function setAttributeOnNode(\DOMElement $node, $name, $value, $namespace = null)
493 493
     {
494 494
         if (null !== $namespace) {
495
-            if (!$prefix = $node->lookupPrefix($namespace)) {
496
-                $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
495
+            if ( ! $prefix = $node->lookupPrefix($namespace)) {
496
+                $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
497 497
             }
498
-            $node->setAttributeNS($namespace, $prefix . ':' . $name, $value);
498
+            $node->setAttributeNS($namespace, $prefix.':'.$name, $value);
499 499
         } else {
500 500
             $node->setAttribute($name, $value);
501 501
         }
@@ -519,6 +519,6 @@  discard block
 block discarded – undo
519 519
      */
520 520
     public function setFormatOutput($formatOutput)
521 521
     {
522
-        $this->formatOutput = (boolean)$formatOutput;
522
+        $this->formatOutput = (boolean) $formatOutput;
523 523
     }
524 524
 }
Please login to merge, or discard this patch.
src/JMS/Serializer/YamlSerializationVisitor.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
         $isHash = isset($type['params'][1]);
85 85
 
86 86
         $count = $this->writer->changeCount;
87
-        $isList = (isset($type['params'][0]) && !isset($type['params'][1]))
87
+        $isList = (isset($type['params'][0]) && ! isset($type['params'][1]))
88 88
             || array_keys($data) === range(0, count($data) - 1);
89 89
 
90 90
         foreach ($data as $k => $v) {
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
                 continue;
93 93
             }
94 94
 
95
-            if ($isList && !$isHash) {
95
+            if ($isList && ! $isHash) {
96 96
                 $this->writer->writeln('-');
97 97
             } else {
98
-                $this->writer->writeln(Inline::dump($k) . ':');
98
+                $this->writer->writeln(Inline::dump($k).':');
99 99
             }
100 100
 
101 101
             $this->writer->indent();
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
             if (null !== $v = $this->navigator->accept($v, $this->getElementType($type), $context)) {
104 104
                 $this->writer
105 105
                     ->rtrim(false)
106
-                    ->writeln(' ' . $v);
106
+                    ->writeln(' '.$v);
107 107
             }
108 108
 
109 109
             $this->writer->outdent();
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
     public function visitDouble($data, array $type, Context $context)
135 135
     {
136
-        $v = (string)$data;
136
+        $v = (string) $data;
137 137
 
138 138
         if ('' === $this->writer->content) {
139 139
             $this->writer->writeln($v);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 
145 145
     public function visitInteger($data, array $type, Context $context)
146 146
     {
147
-        $v = (string)$data;
147
+        $v = (string) $data;
148 148
 
149 149
         if ('' === $this->writer->content) {
150 150
             $this->writer->writeln($v);
@@ -167,9 +167,9 @@  discard block
 block discarded – undo
167 167
 
168 168
         $name = $this->namingStrategy->translateName($metadata);
169 169
 
170
-        if (!$metadata->inline) {
170
+        if ( ! $metadata->inline) {
171 171
             $this->writer
172
-                ->writeln(Inline::dump($name) . ':')
172
+                ->writeln(Inline::dump($name).':')
173 173
                 ->indent();
174 174
         }
175 175
 
@@ -180,12 +180,12 @@  discard block
 block discarded – undo
180 180
         if (null !== $v = $this->navigator->accept($v, $metadata->type, $context)) {
181 181
             $this->writer
182 182
                 ->rtrim(false)
183
-                ->writeln(' ' . $v);
184
-        } elseif ($count === $this->writer->changeCount && !$metadata->inline) {
183
+                ->writeln(' '.$v);
184
+        } elseif ($count === $this->writer->changeCount && ! $metadata->inline) {
185 185
             $this->writer->revert();
186 186
         }
187 187
 
188
-        if (!$metadata->inline) {
188
+        if ( ! $metadata->inline) {
189 189
             $this->writer->outdent();
190 190
         }
191 191
         $this->revertCurrentMetadata();
Please login to merge, or discard this patch.
src/JMS/Serializer/Handler/LazyHandlerRegistry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
             return $this->initializedHandlers[$direction][$typeName][$format];
44 44
         }
45 45
 
46
-        if (!isset($this->handlers[$direction][$typeName][$format])) {
46
+        if ( ! isset($this->handlers[$direction][$typeName][$format])) {
47 47
             return null;
48 48
         }
49 49
 
Please login to merge, or discard this patch.