schmittjoh / serializer

src/GraphNavigator.php

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
         ObjectConstructorInterface $objectConstructor,
         EventDispatcherInterface $dispatcher = null,
         ExpressionEvaluatorInterface $expressionEvaluator = null
-    )
-    {
+    ) {
         $this->dispatcher = $dispatcher;
         $this->metadataFactory = $metadataFactory;
         $this->handlerRegistry = $handlerRegistry;

Spacing +9 added lines, -9 removed lines

@@ -150,7 +150,7 @@ 
             case 'resource':
                 $msg = 'Resources are not supported in serialized data.';
                 if ($context instanceof SerializationContext && null !== $path = $context->getPath()) {
-                    $msg .= ' Path: ' . $path;
+                    $msg .= ' Path: '.$path;
                 }
 
                 throw new RuntimeException($msg);
@@ -206,11 +206,11 @@ 
                 /** @var $metadata ClassMetadata */
                 $metadata = $this->metadataFactory->getMetadataForClass($type['name']);
 
-                if ($metadata->usingExpression && !$this->expressionExclusionStrategy) {
+                if ($metadata->usingExpression && ! $this->expressionExclusionStrategy) {
                     throw new ExpressionLanguageRequiredException("To use conditional exclude/expose in {$metadata->name} you must configure the expression language.");
                 }
 
-                if ($context instanceof DeserializationContext && !empty($metadata->discriminatorMap) && $type['name'] === $metadata->discriminatorBaseClass) {
+                if ($context instanceof DeserializationContext && ! empty($metadata->discriminatorMap) && $type['name'] === $metadata->discriminatorBaseClass) {
                     $metadata = $this->resolveMetadata($data, $metadata);
                 }
 
@@ -280,22 +280,22 @@ 
     {
         switch (true) {
             case is_array($data) && isset($data[$metadata->discriminatorFieldName]):
-                $typeValue = (string)$data[$metadata->discriminatorFieldName];
+                $typeValue = (string) $data[$metadata->discriminatorFieldName];
                 break;
 
             // Check XML attribute for discriminatorFieldName
             case is_object($data) && $metadata->xmlDiscriminatorAttribute && isset($data[$metadata->discriminatorFieldName]):
-                $typeValue = (string)$data[$metadata->discriminatorFieldName];
+                $typeValue = (string) $data[$metadata->discriminatorFieldName];
                 break;
 
             // Check XML element with namespace for discriminatorFieldName
-            case is_object($data) && !$metadata->xmlDiscriminatorAttribute && null !== $metadata->xmlDiscriminatorNamespace && isset($data->children($metadata->xmlDiscriminatorNamespace)->{$metadata->discriminatorFieldName}):
-                $typeValue = (string)$data->children($metadata->xmlDiscriminatorNamespace)->{$metadata->discriminatorFieldName};
+            case is_object($data) && ! $metadata->xmlDiscriminatorAttribute && null !== $metadata->xmlDiscriminatorNamespace && isset($data->children($metadata->xmlDiscriminatorNamespace)->{$metadata->discriminatorFieldName}):
+                $typeValue = (string) $data->children($metadata->xmlDiscriminatorNamespace)->{$metadata->discriminatorFieldName};
                 break;
 
             // Check XML element for discriminatorFieldName
             case is_object($data) && isset($data->{$metadata->discriminatorFieldName}):
-                $typeValue = (string)$data->{$metadata->discriminatorFieldName};
+                $typeValue = (string) $data->{$metadata->discriminatorFieldName};
                 break;
 
             default:
@@ -306,7 +306,7 @@ 
                 ));
         }
 
-        if (!isset($metadata->discriminatorMap[$typeValue])) {
+        if ( ! isset($metadata->discriminatorMap[$typeValue])) {
             throw new \LogicException(sprintf(
                 'The type value "%s" does not exist in the discriminator map of class "%s". Available types: %s',
                 $typeValue,

src/Serializer.php

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
         EventDispatcherInterface $dispatcher = null,
         TypeParser $typeParser = null,
         ExpressionEvaluatorInterface $expressionEvaluator = null
-    )
-    {
+    ) {
         $this->factory = $factory;
         $this->handlerRegistry = $handlerRegistry;
         $this->objectConstructor = $objectConstructor;

Spacing +6 added lines, -6 removed lines

@@ -106,7 +106,7 @@ 
         }
 
         return $this->serializationVisitors->get($format)
-            ->map(function (VisitorInterface $visitor) use ($context, $data, $format) {
+            ->map(function(VisitorInterface $visitor) use ($context, $data, $format) {
                 $type = $context->getInitialType() !== null ? $this->typeParser->parse($context->getInitialType()) : null;
 
                 $this->visit($visitor, $context, $visitor->prepare($data), $format, $type);
@@ -123,7 +123,7 @@ 
         }
 
         return $this->deserializationVisitors->get($format)
-            ->map(function (VisitorInterface $visitor) use ($context, $data, $format, $type) {
+            ->map(function(VisitorInterface $visitor) use ($context, $data, $format, $type) {
                 $preparedData = $visitor->prepare($data);
                 $navigatorResult = $this->visit($visitor, $context, $preparedData, $format, $this->typeParser->parse($type));
 
@@ -142,13 +142,13 @@ 
         }
 
         return $this->serializationVisitors->get('json')
-            ->map(function (JsonSerializationVisitor $visitor) use ($context, $data) {
+            ->map(function(JsonSerializationVisitor $visitor) use ($context, $data) {
                 $type = $context->getInitialType() !== null ? $this->typeParser->parse($context->getInitialType()) : null;
 
                 $this->visit($visitor, $context, $data, 'json', $type);
                 $result = $this->convertArrayObjects($visitor->getRoot());
 
-                if (!is_array($result)) {
+                if ( ! is_array($result)) {
                     throw new RuntimeException(sprintf(
                         'The input data of type "%s" did not convert to an array, but got a result of type "%s".',
                         is_object($data) ? get_class($data) : gettype($data),
@@ -171,7 +171,7 @@ 
         }
 
         return $this->deserializationVisitors->get('json')
-            ->map(function (JsonDeserializationVisitor $visitor) use ($data, $type, $context) {
+            ->map(function(JsonDeserializationVisitor $visitor) use ($data, $type, $context) {
                 $navigatorResult = $this->visit($visitor, $context, $data, 'json', $this->typeParser->parse($type));
 
                 return $this->handleDeserializeResult($visitor->getResult(), $navigatorResult);
@@ -206,7 +206,7 @@ 
     private function convertArrayObjects($data)
     {
         if ($data instanceof \ArrayObject || $data instanceof \stdClass) {
-            $data = (array)$data;
+            $data = (array) $data;
         }
         if (is_array($data)) {
             foreach ($data as $k => $v) {

src/Annotation/VirtualProperty.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         }
 
         foreach ($data as $key => $value) {
-            if (!property_exists(__CLASS__, $key)) {
+            if ( ! property_exists(__CLASS__, $key)) {
                 throw new \BadMethodCallException(sprintf('Unknown property "%s" on annotation "%s".', $key, __CLASS__));
             }
             $this->{$key} = $value;

src/Handler/StdClassHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $classMetadata = $context->getMetadataFactory()->getMetadataForClass('stdClass');
         $visitor->startVisitingObject($classMetadata, $stdClass, array('name' => 'stdClass'), $context);
 
-        foreach ((array)$stdClass as $name => $value) {
+        foreach ((array) $stdClass as $name => $value) {
             $metadata = new StaticPropertyMetadata('stdClass', $name, $value);
             $visitor->visitProperty($metadata, $value, $context);
         }

src/Expression/ExpressionEvaluator.php

Spacing +2 added lines, -2 removed lines

@@ -64,13 +64,13 @@
      */
     public function evaluate($expression, array $data = array())
     {
-        if (!is_string($expression)) {
+        if ( ! is_string($expression)) {
             return $expression;
         }
 
         $context = $data + $this->context;
 
-        if (!array_key_exists($expression, $this->cache)) {
+        if ( ! array_key_exists($expression, $this->cache)) {
             $this->cache[$expression] = $this->expressionLanguage->parse($expression, array_keys($context));
         }
 

src/EventDispatcher/Subscriber/SymfonyValidatorValidatorSubscriber.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
             ? null
             : $context->attributes->get('validation_groups')->get();
 
-        if (!$groups) {
+        if ( ! $groups) {
             return;
         }
 

src/Metadata/Driver/AnnotationDriver.php

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 use JMS\Serializer\Annotation\AccessType;
 use JMS\Serializer\Annotation\Discriminator;
 use JMS\Serializer\Annotation\Exclude;
-use JMS\Serializer\Annotation\ExcludeIf;
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Annotation\Expose;
 use JMS\Serializer\Annotation\Groups;

Spacing +8 added lines, -8 removed lines

@@ -104,9 +104,9 @@ 
                     $classMetadata->setDiscriminator($annot->field, $annot->map, $annot->groups);
                 }
             } elseif ($annot instanceof XmlDiscriminator) {
-                $classMetadata->xmlDiscriminatorAttribute = (bool)$annot->attribute;
-                $classMetadata->xmlDiscriminatorCData = (bool)$annot->cdata;
-                $classMetadata->xmlDiscriminatorNamespace = $annot->namespace ? (string)$annot->namespace : null;
+                $classMetadata->xmlDiscriminatorAttribute = (bool) $annot->attribute;
+                $classMetadata->xmlDiscriminatorCData = (bool) $annot->cdata;
+                $classMetadata->xmlDiscriminatorNamespace = $annot->namespace ? (string) $annot->namespace : null;
             } elseif ($annot instanceof VirtualProperty) {
                 $virtualPropertyMetadata = new ExpressionPropertyMetadata($name, $annot->name, $annot->exp);
                 $propertiesMetadata[] = $virtualPropertyMetadata;
@@ -143,7 +143,7 @@ 
             }
         }
 
-        if (!$excludeAll) {
+        if ( ! $excludeAll) {
             foreach ($class->getProperties() as $property) {
                 if ($property->class !== $name || (isset($property->info) && $property->info['class'] !== $name)) {
                     continue;
@@ -174,7 +174,7 @@ 
                     } elseif ($annot instanceof Expose) {
                         $isExpose = true;
                         if (null !== $annot->if) {
-                            $propertyMetadata->excludeIf = "!(" . $annot->if . ")";
+                            $propertyMetadata->excludeIf = "!(".$annot->if.")";
                         }
                     } elseif ($annot instanceof Exclude) {
                         if (null !== $annot->if) {
@@ -218,12 +218,12 @@ 
                         $accessor = array($annot->getter, $annot->setter);
                     } elseif ($annot instanceof Groups) {
                         $propertyMetadata->groups = $annot->groups;
-                        foreach ((array)$propertyMetadata->groups as $groupName) {
+                        foreach ((array) $propertyMetadata->groups as $groupName) {
                             if (false !== strpos($groupName, ',')) {
                                 throw new InvalidArgumentException(sprintf(
                                     'Invalid group name "%s" on "%s", did you mean to create multiple groups?',
                                     implode(', ', $propertyMetadata->groups),
-                                    $propertyMetadata->class . '->' . $propertyMetadata->name
+                                    $propertyMetadata->class.'->'.$propertyMetadata->name
                                 ));
                             }
                         }
@@ -237,7 +237,7 @@ 
                 }
 
 
-                if ((ExclusionPolicy::NONE === $exclusionPolicy && !$isExclude)
+                if ((ExclusionPolicy::NONE === $exclusionPolicy && ! $isExclude)
                     || (ExclusionPolicy::ALL === $exclusionPolicy && $isExpose)
                 ) {
                     $propertyMetadata->setAccessor($accessType, $accessor[0], $accessor[1]);

src/XmlSerializationVisitor.php

Doc Comments +6 added lines

@@ -127,6 +127,9 @@ 
         return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data);
     }
 
+    /**
+     * @param string $data
+     */
     public function visitSimpleString($data, array $type, Context $context)
     {
         if (null === $this->document) {
@@ -474,6 +477,9 @@ 
         return $this->document->createElementNS($namespace, $prefix . ':' . $tagName);
     }
 
+    /**
+     * @param string $value
+     */
     private function setAttributeOnNode(\DOMElement $node, $name, $value, $namespace = null)
     {
         if (null !== $namespace) {

Spacing +24 added lines, -24 removed lines

@@ -124,24 +124,24 @@ 
 
         if (null === $this->document) {
             $this->document = $this->createDocument(null, null, true);
-            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data));
+            $this->currentNode->appendChild($doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data));
 
             return;
         }
 
-        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string)$data);
+        return $doCData ? $this->document->createCDATASection($data) : $this->document->createTextNode((string) $data);
     }
 
     public function visitSimpleString($data, array $type, Context $context)
     {
         if (null === $this->document) {
             $this->document = $this->createDocument(null, null, true);
-            $this->currentNode->appendChild($this->document->createTextNode((string)$data));
+            $this->currentNode->appendChild($this->document->createTextNode((string) $data));
 
             return;
         }
 
-        return $this->document->createTextNode((string)$data);
+        return $this->document->createTextNode((string) $data);
     }
 
     public function visitBoolean($data, array $type, Context $context)
@@ -189,7 +189,7 @@ 
             $this->setCurrentNode($entryNode);
 
             if (null !== $keyAttributeName) {
-                $entryNode->setAttribute($keyAttributeName, (string)$k);
+                $entryNode->setAttribute($keyAttributeName, (string) $k);
             }
 
             if (null !== $node = $this->navigator->accept($v, $this->getElementType($type), $context)) {
@@ -241,7 +241,7 @@ 
             $node = $this->navigator->accept($v, $metadata->type, $context);
             $this->revertCurrentMetadata();
 
-            if (!$node instanceof \DOMCharacterData) {
+            if ( ! $node instanceof \DOMCharacterData) {
                 throw new RuntimeException(sprintf('Unsupported value for XML attribute for %s. Expected character data, but got %s.', $metadata->name, json_encode($v)));
             }
             $attributeName = $this->namingStrategy->translateName($metadata);
@@ -251,7 +251,7 @@ 
         }
 
         if (($metadata->xmlValue && $this->currentNode->childNodes->length > 0)
-            || (!$metadata->xmlValue && $this->hasValue)
+            || ( ! $metadata->xmlValue && $this->hasValue)
         ) {
             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));
         }
@@ -263,7 +263,7 @@ 
             $node = $this->navigator->accept($v, $metadata->type, $context);
             $this->revertCurrentMetadata();
 
-            if (!$node instanceof \DOMCharacterData) {
+            if ( ! $node instanceof \DOMCharacterData) {
                 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,7 +273,7 @@ 
         }
 
         if ($metadata->xmlAttributeMap) {
-            if (!is_array($v)) {
+            if ( ! is_array($v)) {
                 throw new RuntimeException(sprintf('Unsupported value type for XML attribute map. Expected array but got %s.', gettype($v)));
             }
 
@@ -282,7 +282,7 @@ 
                 $node = $this->navigator->accept($value, null, $context);
                 $this->revertCurrentMetadata();
 
-                if (!$node instanceof \DOMCharacterData) {
+                if ( ! $node instanceof \DOMCharacterData) {
                     throw new RuntimeException(sprintf('Unsupported value for a XML attribute map value. Expected character data, but got %s.', json_encode($v)));
                 }
 
@@ -292,7 +292,7 @@ 
             return;
         }
 
-        if ($addEnclosingElement = !$this->isInLineCollection($metadata) && !$metadata->inline) {
+        if ($addEnclosingElement = ! $this->isInLineCollection($metadata) && ! $metadata->inline) {
             $elementName = $this->namingStrategy->translateName($metadata);
 
             $namespace = null !== $metadata->xmlNamespace
@@ -335,7 +335,7 @@ 
 
     private function isSkippableEmptyObject($node, PropertyMetadata $metadata)
     {
-        return $node === null && !$metadata->xmlCollection && $metadata->skipWhenEmpty;
+        return $node === null && ! $metadata->xmlCollection && $metadata->skipWhenEmpty;
     }
 
     private function isSkippableCollection(PropertyMetadata $metadata)
@@ -345,7 +345,7 @@ 
 
     private function isElementEmpty(\DOMElement $element)
     {
-        return !$element->hasChildNodes() && !$element->hasAttributes();
+        return ! $element->hasChildNodes() && ! $element->hasAttributes();
     }
 
     public function endVisitingObject(ClassMetadata $metadata, $data, array $type, Context $context)
@@ -424,12 +424,12 @@ 
     {
         if (null === $this->document) {
             $this->document = $this->createDocument(null, null, true);
-            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string)$data));
+            $this->currentNode->appendChild($textNode = $this->document->createTextNode((string) $data));
 
             return $textNode;
         }
 
-        return $this->document->createTextNode((string)$data);
+        return $this->document->createTextNode((string) $data);
     }
 
     /**
@@ -446,7 +446,7 @@ 
 
     private function attachNullNamespace()
     {
-        if (!$this->nullWasVisited) {
+        if ( ! $this->nullWasVisited) {
             $this->document->documentElement->setAttributeNS(
                 'http://www.w3.org/2000/xmlns/',
                 'xmlns:xsi',
@@ -467,7 +467,7 @@ 
         foreach ($metadata->xmlNamespaces as $prefix => $uri) {
             $attribute = 'xmlns';
             if ($prefix !== '') {
-                $attribute .= ':' . $prefix;
+                $attribute .= ':'.$prefix;
             } elseif ($element->namespaceURI === $uri) {
                 continue;
             }
@@ -483,19 +483,19 @@ 
         if ($this->currentNode->isDefaultNamespace($namespace)) {
             return $this->document->createElementNS($namespace, $tagName);
         }
-        if (!($prefix = $this->currentNode->lookupPrefix($namespace)) && !($prefix = $this->document->lookupPrefix($namespace))) {
-            $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
+        if ( ! ($prefix = $this->currentNode->lookupPrefix($namespace)) && ! ($prefix = $this->document->lookupPrefix($namespace))) {
+            $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
         }
-        return $this->document->createElementNS($namespace, $prefix . ':' . $tagName);
+        return $this->document->createElementNS($namespace, $prefix.':'.$tagName);
     }
 
     private function setAttributeOnNode(\DOMElement $node, $name, $value, $namespace = null)
     {
         if (null !== $namespace) {
-            if (!$prefix = $node->lookupPrefix($namespace)) {
-                $prefix = 'ns-' . substr(sha1($namespace), 0, 8);
+            if ( ! $prefix = $node->lookupPrefix($namespace)) {
+                $prefix = 'ns-'.substr(sha1($namespace), 0, 8);
             }
-            $node->setAttributeNS($namespace, $prefix . ':' . $name, $value);
+            $node->setAttributeNS($namespace, $prefix.':'.$name, $value);
         } else {
             $node->setAttribute($name, $value);
         }
@@ -519,6 +519,6 @@ 
      */
     public function setFormatOutput($formatOutput)
     {
-        $this->formatOutput = (boolean)$formatOutput;
+        $this->formatOutput = (boolean) $formatOutput;
     }
 }

src/Exclusion/GroupsExclusionStrategy.php

Spacing +3 added lines, -3 removed lines

@@ -52,8 +52,8 @@ 
     {
         $groups = $this->getGroupsFor($navigatorContext);
 
-        if (!$property->groups) {
-            return !in_array(self::DEFAULT_GROUP, $groups);
+        if ( ! $property->groups) {
+            return ! in_array(self::DEFAULT_GROUP, $groups);
         }
 
         return $this->shouldSkipUsingGroups($property, $groups);
@@ -76,7 +76,7 @@ 
 
         $groups = $this->groups;
         foreach ($paths as $index => $path) {
-            if (!array_key_exists($path, $groups)) {
+            if ( ! array_key_exists($path, $groups)) {
                 if ($index > 0) {
                     $groups = array(self::DEFAULT_GROUP);
                 }