@@ -23,17 +23,11 @@ |
||
| 23 | 23 | use JMS\Serializer\Handler\PhpCollectionHandler; |
| 24 | 24 | use JMS\Serializer\Handler\PropelCollectionHandler; |
| 25 | 25 | use JMS\Serializer\Exception\RuntimeException; |
| 26 | -use Metadata\Driver\DriverInterface; |
|
| 27 | 26 | use Metadata\MetadataFactory; |
| 28 | -use JMS\Serializer\Metadata\Driver\AnnotationDriver; |
|
| 29 | 27 | use JMS\Serializer\Handler\HandlerRegistry; |
| 30 | 28 | use JMS\Serializer\Construction\UnserializeObjectConstructor; |
| 31 | 29 | use PhpCollection\Map; |
| 32 | 30 | use JMS\Serializer\EventDispatcher\EventDispatcher; |
| 33 | -use Metadata\Driver\DriverChain; |
|
| 34 | -use JMS\Serializer\Metadata\Driver\YamlDriver; |
|
| 35 | -use JMS\Serializer\Metadata\Driver\XmlDriver; |
|
| 36 | -use Metadata\Driver\FileLocator; |
|
| 37 | 31 | use JMS\Serializer\Handler\DateHandler; |
| 38 | 32 | use JMS\Serializer\Handler\ArrayCollectionHandler; |
| 39 | 33 | use JMS\Serializer\Construction\ObjectConstructorInterface; |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $this->classListeners[$eventName][$loweredClass][$format] = $this->initializeListeners($eventName, $loweredClass, $format); |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - return !!$this->classListeners[$eventName][$loweredClass][$format]; |
|
| 83 | + return ! ! $this->classListeners[$eventName][$loweredClass][$format]; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public function dispatch($eventName, $class, $format, Event $event) |
@@ -83,16 +83,16 @@ |
||
| 83 | 83 | $addition = ''; |
| 84 | 84 | |
| 85 | 85 | $lines = explode("\n", $content); |
| 86 | - for ($i=0,$c=count($lines); $i<$c; $i++) { |
|
| 86 | + for ($i = 0, $c = count($lines); $i < $c; $i++) { |
|
| 87 | 87 | if ($this->indentationLevel > 0 |
| 88 | - && !empty($lines[$i]) |
|
| 88 | + && ! empty($lines[$i]) |
|
| 89 | 89 | && ((empty($addition) && "\n" === substr($this->content, -1)) || "\n" === substr($addition, -1))) { |
| 90 | 90 | $addition .= str_repeat(' ', $this->indentationLevel * $this->indentationSpaces); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | $addition .= $lines[$i]; |
| 94 | 94 | |
| 95 | - if ($i+1 < $c) { |
|
| 95 | + if ($i + 1 < $c) { |
|
| 96 | 96 | $addition .= "\n"; |
| 97 | 97 | } |
| 98 | 98 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | if (is_array($metadataGroups) && empty($metadataGroups)) { |
| 55 | 55 | return true; |
| 56 | 56 | } |
| 57 | - if (!empty($this->groups) && array_intersect(array_keys($this->groups), $metadataGroups)) { |
|
| 57 | + if ( ! empty($this->groups) && array_intersect(array_keys($this->groups), $metadataGroups)) { |
|
| 58 | 58 | return true; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -191,8 +191,8 @@ discard block |
||
| 191 | 191 | } elseif ($annot instanceof Accessor) { |
| 192 | 192 | $accessor = array($annot->getter, $annot->setter); |
| 193 | 193 | } elseif ($annot instanceof Exclude) { |
| 194 | - if (!empty($annot->groups)) { |
|
| 195 | - $annotationSource = $propertyMetadata->class . '->' . $propertyMetadata->name; |
|
| 194 | + if ( ! empty($annot->groups)) { |
|
| 195 | + $annotationSource = $propertyMetadata->class.'->'.$propertyMetadata->name; |
|
| 196 | 196 | $this->sanitizeGroupNames($annot->groups, $annotationSource); |
| 197 | 197 | $propertyMetadata->exclusionGroups = $annot->groups; |
| 198 | 198 | } else { |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | } elseif ($annot instanceof Groups) { |
| 203 | 203 | $propertyMetadata->groups = $annot->groups; |
| 204 | - $annotationSource = $propertyMetadata->class . '->' . $propertyMetadata->name; |
|
| 204 | + $annotationSource = $propertyMetadata->class.'->'.$propertyMetadata->name; |
|
| 205 | 205 | $this->sanitizeGroupNames($propertyMetadata->groups, $annotationSource); |
| 206 | 206 | } elseif ($annot instanceof Inline) { |
| 207 | 207 | $propertyMetadata->inline = true; |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | */ |
| 230 | 230 | private function sanitizeGroupNames($groups, $annotationSource) |
| 231 | 231 | { |
| 232 | - foreach ((array)$groups as $groupName) { |
|
| 232 | + foreach ((array) $groups as $groupName) { |
|
| 233 | 233 | if (false !== strpos($groupName, ',')) { |
| 234 | 234 | throw new InvalidArgumentException(sprintf( |
| 235 | 235 | 'Invalid group name "%s" on "%s", did you mean to create multiple groups?', |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | |
| 19 | 19 | namespace JMS\Serializer; |
| 20 | 20 | |
| 21 | -use JMS\Serializer\Exception\LogicException; |
|
| 22 | 21 | use JMS\Serializer\Exception\RuntimeException; |
| 23 | 22 | use Metadata\MetadataFactoryInterface; |
| 24 | 23 | |
@@ -166,10 +166,10 @@ |
||
| 166 | 166 | $parentStr |
| 167 | 167 | ) = $unserialized; |
| 168 | 168 | |
| 169 | - if (isset($unserialized['xmlEntryNamespace'])){ |
|
| 169 | + if (isset($unserialized['xmlEntryNamespace'])) { |
|
| 170 | 170 | $this->xmlEntryNamespace = $unserialized['xmlEntryNamespace']; |
| 171 | 171 | } |
| 172 | - if (isset($unserialized['xmlCollectionSkipWhenEmpty'])){ |
|
| 172 | + if (isset($unserialized['xmlCollectionSkipWhenEmpty'])) { |
|
| 173 | 173 | $this->xmlCollectionSkipWhenEmpty = $unserialized['xmlCollectionSkipWhenEmpty']; |
| 174 | 174 | } |
| 175 | 175 | |
@@ -113,15 +113,15 @@ |
||
| 113 | 113 | |
| 114 | 114 | $colConfig = $pConfig['xml_list']; |
| 115 | 115 | if (isset($colConfig['inline'])) { |
| 116 | - $pMetadata->xmlCollectionInline = (Boolean)$colConfig['inline']; |
|
| 116 | + $pMetadata->xmlCollectionInline = (Boolean) $colConfig['inline']; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | if (isset($colConfig['entry_name'])) { |
| 120 | - $pMetadata->xmlEntryName = (string)$colConfig['entry_name']; |
|
| 120 | + $pMetadata->xmlEntryName = (string) $colConfig['entry_name']; |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if (isset($colConfig['skip_when_empty'])) { |
| 124 | - $pMetadata->xmlCollectionSkipWhenEmpty = (Boolean)$colConfig['skip_when_empty']; |
|
| 124 | + $pMetadata->xmlCollectionSkipWhenEmpty = (Boolean) $colConfig['skip_when_empty']; |
|
| 125 | 125 | } else { |
| 126 | 126 | $pMetadata->xmlCollectionSkipWhenEmpty = true; |
| 127 | 127 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | if (false !== stripos($data, '<!doctype')) { |
| 65 | 65 | $internalSubset = $this->getDomDocumentTypeEntitySubset($data); |
| 66 | - if (!in_array($internalSubset, $this->doctypeWhitelist, true)) { |
|
| 66 | + if ( ! in_array($internalSubset, $this->doctypeWhitelist, true)) { |
|
| 67 | 67 | throw new InvalidArgumentException(sprintf( |
| 68 | 68 | 'The document type "%s" is not allowed. If it is safe, you may add it to the whitelist configuration.', |
| 69 | 69 | $internalSubset |
@@ -147,10 +147,10 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | if ($namespace === null && $this->objectMetadataStack->count()) { |
| 149 | 149 | $classMetadata = $this->objectMetadataStack->top(); |
| 150 | - $namespace = isset($classMetadata->xmlNamespaces[''])?$classMetadata->xmlNamespaces['']:$namespace; |
|
| 150 | + $namespace = isset($classMetadata->xmlNamespaces['']) ? $classMetadata->xmlNamespaces[''] : $namespace; |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | - if ( ! isset($data->$entryName) ) { |
|
| 153 | + if ( ! isset($data->$entryName)) { |
|
| 154 | 154 | if (null === $this->result) { |
| 155 | 155 | return $this->result = array(); |
| 156 | 156 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | if ($metadata->xmlCollection) { |
| 244 | 244 | $enclosingElem = $data; |
| 245 | - if (!$metadata->xmlCollectionInline) { |
|
| 245 | + if ( ! $metadata->xmlCollectionInline) { |
|
| 246 | 246 | $enclosingElem = $data->children($metadata->xmlNamespace)->$name; |
| 247 | 247 | } |
| 248 | 248 | |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | |
| 257 | 257 | if ($metadata->xmlNamespace) { |
| 258 | 258 | $node = $data->children($metadata->xmlNamespace)->$name; |
| 259 | - if (!$node->count()) { |
|
| 259 | + if ( ! $node->count()) { |
|
| 260 | 260 | return; |
| 261 | 261 | } |
| 262 | 262 | } else { |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | if (isset($namespaces[''])) { |
| 267 | 267 | $prefix = uniqid('ns-'); |
| 268 | 268 | $data->registerXPathNamespace($prefix, $namespaces['']); |
| 269 | - $nodes = $data->xpath('./'.$prefix. ':'.$name ); |
|
| 269 | + $nodes = $data->xpath('./'.$prefix.':'.$name); |
|
| 270 | 270 | } else { |
| 271 | - $nodes = $data->xpath('./'. $name ); |
|
| 271 | + $nodes = $data->xpath('./'.$name); |
|
| 272 | 272 | } |
| 273 | 273 | if (empty($nodes)) { |
| 274 | 274 | return; |