schmittjoh / serializer

src/JMS/Serializer/Builder/DefaultDriverFactory.php

Braces +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
         array $metadataDirs,
         Reader $annotationReader,
         ClassMetadataUpdaterInterface $propertyUpdater = null
-    )
-    {
+    ) {
         $annotationDriver = new AnnotationDriver($annotationReader, $propertyUpdater);
         if (empty($metadataDirs)) {
             return $annotationDriver;

src/JMS/Serializer/Metadata/PropertyMetadata.php

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
         $this->name = $name;
         $this->prepareLazyReflection();
 
-        $this->closureAccessor = \Closure::bind(function ($o, $name) {
+        $this->closureAccessor = \Closure::bind(function($o, $name) {
             return $o->$name;
         }, null, $class);
     }
@@ -97,7 +97,7 @@ 
 
     public function getReflection()
     {
-        if (!$this->lazyReflection) {
+        if ( ! $this->lazyReflection) {
             $this->lazyReflection = new \ReflectionProperty($this->class, $this->name);
             $this->lazyReflection->setAccessible(true);
         }
@@ -228,7 +228,7 @@ 
         list($this->class, $this->name) = unserialize($parentStr);
         $this->prepareLazyReflection();
 
-        $this->closureAccessor = \Closure::bind(function ($o, $name) {
+        $this->closureAccessor = \Closure::bind(function($o, $name) {
             return $o->$name;
         }, null, $this->class);
     }

src/JMS/Serializer/Metadata/Driver/YamlDriver.php

Spacing +42 added lines, -42 removed lines

@@ -50,7 +50,7 @@ 
     {
         $config = Yaml::parse(file_get_contents($file));
 
-        if (!isset($config[$name = $class->name])) {
+        if ( ! isset($config[$name = $class->name])) {
             throw new RuntimeException(sprintf('Expected metadata for class %s to be defined in %s.', $class->name, $file));
         }
 
@@ -59,10 +59,10 @@ 
         $metadata->fileResources[] = $file;
         $metadata->fileResources[] = $class->getFileName();
         $exclusionPolicy = isset($config['exclusion_policy']) ? strtoupper($config['exclusion_policy']) : 'NONE';
-        $excludeAll = isset($config['exclude']) ? (Boolean)$config['exclude'] : false;
+        $excludeAll = isset($config['exclude']) ? (Boolean) $config['exclude'] : false;
         $metadata->accessType = isset($config['access_type']) ? $config['access_type'] : null;
         $metadata->accessTypeNaming = isset($config['access_type_naming']) ? $config['access_type_naming'] : null;
-        $readOnlyClass = isset($config['read_only']) ? (Boolean)$config['read_only'] : false;
+        $readOnlyClass = isset($config['read_only']) ? (Boolean) $config['read_only'] : false;
         $this->addClassProperties($metadata, $config);
 
         $propertiesMetadata = array();
@@ -74,8 +74,8 @@ 
 
                 } else {
 
-                    if (!$class->hasMethod($methodName)) {
-                        throw new RuntimeException('The method ' . $methodName . ' not found in class ' . $class->name);
+                    if ( ! $class->hasMethod($methodName)) {
+                        throw new RuntimeException('The method '.$methodName.' not found in class '.$class->name);
                     }
                     $virtualPropertyMetadata = new VirtualPropertyMetadata($name, $methodName);
                 }
@@ -84,7 +84,7 @@ 
             }
         }
 
-        if (!$excludeAll) {
+        if ( ! $excludeAll) {
             foreach ($class->getProperties() as $property) {
                 if ($property->class !== $name || (isset($property->info) && $property->info['class'] !== $name)) {
                     continue;
@@ -105,7 +105,7 @@ 
                     $pConfig = $config['properties'][$pName];
 
                     if (isset($pConfig['exclude'])) {
-                        $isExclude = (Boolean)$pConfig['exclude'];
+                        $isExclude = (Boolean) $pConfig['exclude'];
                     }
 
                     if ($isExclude) {
@@ -113,35 +113,35 @@ 
                     }
 
                     if (isset($pConfig['expose'])) {
-                        $isExpose = (Boolean)$pConfig['expose'];
+                        $isExpose = (Boolean) $pConfig['expose'];
                     }
 
                     if (isset($pConfig['skip_when_empty'])) {
-                        $pMetadata->skipWhenEmpty = (Boolean)$pConfig['skip_when_empty'];
+                        $pMetadata->skipWhenEmpty = (Boolean) $pConfig['skip_when_empty'];
                     }
 
                     if (isset($pConfig['since_version'])) {
-                        $pMetadata->sinceVersion = (string)$pConfig['since_version'];
+                        $pMetadata->sinceVersion = (string) $pConfig['since_version'];
                     }
 
                     if (isset($pConfig['until_version'])) {
-                        $pMetadata->untilVersion = (string)$pConfig['until_version'];
+                        $pMetadata->untilVersion = (string) $pConfig['until_version'];
                     }
 
                     if (isset($pConfig['exclude_if'])) {
-                        $pMetadata->excludeIf = (string)$pConfig['exclude_if'];
+                        $pMetadata->excludeIf = (string) $pConfig['exclude_if'];
                     }
 
                     if (isset($pConfig['expose_if'])) {
-                        $pMetadata->excludeIf = "!(" . $pConfig['expose_if'] . ")";
+                        $pMetadata->excludeIf = "!(".$pConfig['expose_if'].")";
                     }
 
                     if (isset($pConfig['serialized_name'])) {
-                        $pMetadata->serializedName = (string)$pConfig['serialized_name'];
+                        $pMetadata->serializedName = (string) $pConfig['serialized_name'];
                     }
 
                     if (isset($pConfig['type'])) {
-                        $pMetadata->setType((string)$pConfig['type']);
+                        $pMetadata->setType((string) $pConfig['type']);
                     }
 
                     if (isset($pConfig['groups'])) {
@@ -153,21 +153,21 @@ 
 
                         $colConfig = $pConfig['xml_list'];
                         if (isset($colConfig['inline'])) {
-                            $pMetadata->xmlCollectionInline = (Boolean)$colConfig['inline'];
+                            $pMetadata->xmlCollectionInline = (Boolean) $colConfig['inline'];
                         }
 
                         if (isset($colConfig['entry_name'])) {
-                            $pMetadata->xmlEntryName = (string)$colConfig['entry_name'];
+                            $pMetadata->xmlEntryName = (string) $colConfig['entry_name'];
                         }
 
                         if (isset($colConfig['skip_when_empty'])) {
-                            $pMetadata->xmlCollectionSkipWhenEmpty = (Boolean)$colConfig['skip_when_empty'];
+                            $pMetadata->xmlCollectionSkipWhenEmpty = (Boolean) $colConfig['skip_when_empty'];
                         } else {
                             $pMetadata->xmlCollectionSkipWhenEmpty = true;
                         }
 
                         if (isset($colConfig['namespace'])) {
-                            $pMetadata->xmlEntryNamespace = (string)$colConfig['namespace'];
+                            $pMetadata->xmlEntryNamespace = (string) $colConfig['namespace'];
                         }
                     }
 
@@ -176,15 +176,15 @@ 
 
                         $colConfig = $pConfig['xml_map'];
                         if (isset($colConfig['inline'])) {
-                            $pMetadata->xmlCollectionInline = (Boolean)$colConfig['inline'];
+                            $pMetadata->xmlCollectionInline = (Boolean) $colConfig['inline'];
                         }
 
                         if (isset($colConfig['entry_name'])) {
-                            $pMetadata->xmlEntryName = (string)$colConfig['entry_name'];
+                            $pMetadata->xmlEntryName = (string) $colConfig['entry_name'];
                         }
 
                         if (isset($colConfig['namespace'])) {
-                            $pMetadata->xmlEntryNamespace = (string)$colConfig['namespace'];
+                            $pMetadata->xmlEntryNamespace = (string) $colConfig['namespace'];
                         }
 
                         if (isset($colConfig['key_attribute_name'])) {
@@ -196,33 +196,33 @@ 
                     if (isset($pConfig['xml_element'])) {
                         $colConfig = $pConfig['xml_element'];
                         if (isset($colConfig['cdata'])) {
-                            $pMetadata->xmlElementCData = (Boolean)$colConfig['cdata'];
+                            $pMetadata->xmlElementCData = (Boolean) $colConfig['cdata'];
                         }
 
                         if (isset($colConfig['namespace'])) {
-                            $pMetadata->xmlNamespace = (string)$colConfig['namespace'];
+                            $pMetadata->xmlNamespace = (string) $colConfig['namespace'];
                         }
                     }
 
                     if (isset($pConfig['xml_attribute'])) {
-                        $pMetadata->xmlAttribute = (Boolean)$pConfig['xml_attribute'];
+                        $pMetadata->xmlAttribute = (Boolean) $pConfig['xml_attribute'];
                     }
 
                     if (isset($pConfig['xml_attribute_map'])) {
-                        $pMetadata->xmlAttributeMap = (Boolean)$pConfig['xml_attribute_map'];
+                        $pMetadata->xmlAttributeMap = (Boolean) $pConfig['xml_attribute_map'];
                     }
 
                     if (isset($pConfig['xml_value'])) {
-                        $pMetadata->xmlValue = (Boolean)$pConfig['xml_value'];
+                        $pMetadata->xmlValue = (Boolean) $pConfig['xml_value'];
                     }
 
                     if (isset($pConfig['xml_key_value_pairs'])) {
-                        $pMetadata->xmlKeyValuePairs = (Boolean)$pConfig['xml_key_value_pairs'];
+                        $pMetadata->xmlKeyValuePairs = (Boolean) $pConfig['xml_key_value_pairs'];
                     }
 
                     //we need read_only before setter and getter set, because that method depends on flag being set
                     if (isset($pConfig['read_only'])) {
-                        $pMetadata->readOnly = (Boolean)$pConfig['read_only'];
+                        $pMetadata->readOnly = (Boolean) $pConfig['read_only'];
                     } else {
                         $pMetadata->readOnly = $pMetadata->readOnly || $readOnlyClass;
                     }
@@ -235,14 +235,14 @@ 
                     );
 
                     if (isset($pConfig['inline'])) {
-                        $pMetadata->inline = (Boolean)$pConfig['inline'];
+                        $pMetadata->inline = (Boolean) $pConfig['inline'];
                     }
 
                     if (isset($pConfig['max_depth'])) {
-                        $pMetadata->maxDepth = (int)$pConfig['max_depth'];
+                        $pMetadata->maxDepth = (int) $pConfig['max_depth'];
                     }
                 }
-                if ((ExclusionPolicy::NONE === $exclusionPolicy && !$isExclude)
+                if ((ExclusionPolicy::NONE === $exclusionPolicy && ! $isExclude)
                     || (ExclusionPolicy::ALL === $exclusionPolicy && $isExpose)
                 ) {
                     $metadata->addPropertyMetadata($pMetadata);
@@ -285,7 +285,7 @@ 
 
     private function addClassProperties(ClassMetadata $metadata, array $config)
     {
-        if (isset($config['custom_accessor_order']) && !isset($config['accessor_order'])) {
+        if (isset($config['custom_accessor_order']) && ! isset($config['accessor_order'])) {
             $config['accessor_order'] = 'custom';
         }
 
@@ -294,11 +294,11 @@ 
         }
 
         if (isset($config['xml_root_name'])) {
-            $metadata->xmlRootName = (string)$config['xml_root_name'];
+            $metadata->xmlRootName = (string) $config['xml_root_name'];
         }
 
         if (isset($config['xml_root_namespace'])) {
-            $metadata->xmlRootNamespace = (string)$config['xml_root_namespace'];
+            $metadata->xmlRootNamespace = (string) $config['xml_root_namespace'];
         }
 
         if (array_key_exists('xml_namespaces', $config)) {
@@ -313,25 +313,25 @@ 
             if (isset($config['discriminator']['disabled']) && true === $config['discriminator']['disabled']) {
                 $metadata->discriminatorDisabled = true;
             } else {
-                if (!isset($config['discriminator']['field_name'])) {
+                if ( ! isset($config['discriminator']['field_name'])) {
                     throw new RuntimeException('The "field_name" attribute must be set for discriminators.');
                 }
 
-                if (!isset($config['discriminator']['map']) || !\is_array($config['discriminator']['map'])) {
+                if ( ! isset($config['discriminator']['map']) || ! \is_array($config['discriminator']['map'])) {
                     throw new RuntimeException('The "map" attribute must be set, and be an array for discriminators.');
                 }
                 $groups = isset($config['discriminator']['groups']) ? $config['discriminator']['groups'] : array();
                 $metadata->setDiscriminator($config['discriminator']['field_name'], $config['discriminator']['map'], $groups);
 
                 if (isset($config['discriminator']['xml_attribute'])) {
-                    $metadata->xmlDiscriminatorAttribute = (bool)$config['discriminator']['xml_attribute'];
+                    $metadata->xmlDiscriminatorAttribute = (bool) $config['discriminator']['xml_attribute'];
                 }
                 if (isset($config['discriminator']['xml_element'])) {
                     if (isset($config['discriminator']['xml_element']['cdata'])) {
-                        $metadata->xmlDiscriminatorCData = (bool)$config['discriminator']['xml_element']['cdata'];
+                        $metadata->xmlDiscriminatorCData = (bool) $config['discriminator']['xml_element']['cdata'];
                     }
                     if (isset($config['discriminator']['xml_element']['namespace'])) {
-                        $metadata->xmlDiscriminatorNamespace = (string)$config['discriminator']['xml_element']['namespace'];
+                        $metadata->xmlDiscriminatorNamespace = (string) $config['discriminator']['xml_element']['namespace'];
                     }
                 }
 
@@ -343,13 +343,13 @@ 
     {
         if (\is_string($config)) {
             $config = array($config);
-        } elseif (!\is_array($config)) {
+        } elseif ( ! \is_array($config)) {
             throw new RuntimeException(sprintf('callback methods expects a string, or an array of strings that represent method names, but got %s.', json_encode($config['pre_serialize'])));
         }
 
         $methods = array();
         foreach ($config as $name) {
-            if (!$class->hasMethod($name)) {
+            if ( ! $class->hasMethod($name)) {
                 throw new RuntimeException(sprintf('The method %s does not exist in class %s.', $name, $class->name));
             }
 

src/JMS/Serializer/Metadata/Driver/XmlDriver.php

Spacing +57 added lines, -57 removed lines

@@ -58,7 +58,7 @@ 
         }
 
         $metadata = new ClassMetadata($name = $class->name);
-        if (!$elems = $elem->xpath("./class[@name = '" . $name . "']")) {
+        if ( ! $elems = $elem->xpath("./class[@name = '".$name."']")) {
             throw new RuntimeException(sprintf('Could not find class %s inside XML element.', $name));
         }
         $elem = reset($elems);
@@ -74,82 +74,82 @@ 
         $propertiesNodes = array();
 
         if (null !== $accessorOrder = $elem->attributes()->{'accessor-order'}) {
-            $metadata->setAccessorOrder((string)$accessorOrder, preg_split('/\s*,\s*/', (string)$elem->attributes()->{'custom-accessor-order'}));
+            $metadata->setAccessorOrder((string) $accessorOrder, preg_split('/\s*,\s*/', (string) $elem->attributes()->{'custom-accessor-order'}));
         }
 
         if (null !== $xmlRootName = $elem->attributes()->{'xml-root-name'}) {
-            $metadata->xmlRootName = (string)$xmlRootName;
+            $metadata->xmlRootName = (string) $xmlRootName;
         }
 
         if (null !== $xmlRootNamespace = $elem->attributes()->{'xml-root-namespace'}) {
-            $metadata->xmlRootNamespace = (string)$xmlRootNamespace;
+            $metadata->xmlRootNamespace = (string) $xmlRootNamespace;
         }
 
         $readOnlyClass = 'true' === strtolower($elem->attributes()->{'read-only'});
 
-        $discriminatorFieldName = (string)$elem->attributes()->{'discriminator-field-name'};
+        $discriminatorFieldName = (string) $elem->attributes()->{'discriminator-field-name'};
         $discriminatorMap = array();
         foreach ($elem->xpath('./discriminator-class') as $entry) {
-            if (!isset($entry->attributes()->value)) {
+            if ( ! isset($entry->attributes()->value)) {
                 throw new RuntimeException('Each discriminator-class element must have a "value" attribute.');
             }
 
-            $discriminatorMap[(string)$entry->attributes()->value] = (string)$entry;
+            $discriminatorMap[(string) $entry->attributes()->value] = (string) $entry;
         }
 
-        if ('true' === (string)$elem->attributes()->{'discriminator-disabled'}) {
+        if ('true' === (string) $elem->attributes()->{'discriminator-disabled'}) {
             $metadata->discriminatorDisabled = true;
-        } elseif (!empty($discriminatorFieldName) || !empty($discriminatorMap)) {
+        } elseif ( ! empty($discriminatorFieldName) || ! empty($discriminatorMap)) {
 
             $discriminatorGroups = array();
             foreach ($elem->xpath('./discriminator-groups/group') as $entry) {
-                $discriminatorGroups[] = (string)$entry;
+                $discriminatorGroups[] = (string) $entry;
             }
             $metadata->setDiscriminator($discriminatorFieldName, $discriminatorMap, $discriminatorGroups);
         }
 
         foreach ($elem->xpath('./xml-namespace') as $xmlNamespace) {
-            if (!isset($xmlNamespace->attributes()->uri)) {
+            if ( ! isset($xmlNamespace->attributes()->uri)) {
                 throw new RuntimeException('The prefix attribute must be set for all xml-namespace elements.');
             }
 
             if (isset($xmlNamespace->attributes()->prefix)) {
-                $prefix = (string)$xmlNamespace->attributes()->prefix;
+                $prefix = (string) $xmlNamespace->attributes()->prefix;
             } else {
                 $prefix = null;
             }
 
-            $metadata->registerNamespace((string)$xmlNamespace->attributes()->uri, $prefix);
+            $metadata->registerNamespace((string) $xmlNamespace->attributes()->uri, $prefix);
         }
 
         foreach ($elem->xpath('./xml-discriminator') as $xmlDiscriminator) {
             if (isset($xmlDiscriminator->attributes()->attribute)) {
-                $metadata->xmlDiscriminatorAttribute = (string)$xmlDiscriminator->attributes()->attribute === 'true';
+                $metadata->xmlDiscriminatorAttribute = (string) $xmlDiscriminator->attributes()->attribute === 'true';
             }
             if (isset($xmlDiscriminator->attributes()->cdata)) {
-                $metadata->xmlDiscriminatorCData = (string)$xmlDiscriminator->attributes()->cdata === 'true';
+                $metadata->xmlDiscriminatorCData = (string) $xmlDiscriminator->attributes()->cdata === 'true';
             }
             if (isset($xmlDiscriminator->attributes()->namespace)) {
-                $metadata->xmlDiscriminatorNamespace = (string)$xmlDiscriminator->attributes()->namespace;
+                $metadata->xmlDiscriminatorNamespace = (string) $xmlDiscriminator->attributes()->namespace;
             }
         }
 
         foreach ($elem->xpath('./virtual-property') as $method) {
 
             if (isset($method->attributes()->expression)) {
-                $virtualPropertyMetadata = new ExpressionPropertyMetadata($name, (string)$method->attributes()->name, (string)$method->attributes()->expression);
+                $virtualPropertyMetadata = new ExpressionPropertyMetadata($name, (string) $method->attributes()->name, (string) $method->attributes()->expression);
             } else {
-                if (!isset($method->attributes()->method)) {
+                if ( ! isset($method->attributes()->method)) {
                     throw new RuntimeException('The method attribute must be set for all virtual-property elements.');
                 }
-                $virtualPropertyMetadata = new VirtualPropertyMetadata($name, (string)$method->attributes()->method);
+                $virtualPropertyMetadata = new VirtualPropertyMetadata($name, (string) $method->attributes()->method);
             }
 
             $propertiesMetadata[] = $virtualPropertyMetadata;
             $propertiesNodes[] = $method;
         }
 
-        if (!$excludeAll) {
+        if ( ! $excludeAll) {
 
             foreach ($class->getProperties() as $property) {
                 if ($property->class !== $name || (isset($property->info) && $property->info['class'] !== $name)) {
@@ -157,7 +157,7 @@ 
                 }
 
                 $propertiesMetadata[] = new PropertyMetadata($name, $pName = $property->getName());
-                $pElems = $elem->xpath("./property[@name = '" . $pName . "']");
+                $pElems = $elem->xpath("./property[@name = '".$pName."']");
 
                 $propertiesNodes[] = $pElems ? reset($pElems) : null;
             }
@@ -170,7 +170,7 @@ 
                     || $pMetadata instanceof ExpressionPropertyMetadata;
 
                 $pElem = $propertiesNodes[$propertyKey];
-                if (!empty($pElem)) {
+                if ( ! empty($pElem)) {
 
                     if (null !== $exclude = $pElem->attributes()->exclude) {
                         $isExclude = 'true' === strtolower($exclude);
@@ -193,26 +193,26 @@ 
                     }
 
                     if (null !== $excludeIf = $pElem->attributes()->{'expose-if'}) {
-                        $pMetadata->excludeIf = "!(" . $excludeIf . ")";
+                        $pMetadata->excludeIf = "!(".$excludeIf.")";
                         $isExpose = true;
                     }
 
                     if (null !== $version = $pElem->attributes()->{'since-version'}) {
-                        $pMetadata->sinceVersion = (string)$version;
+                        $pMetadata->sinceVersion = (string) $version;
                     }
 
                     if (null !== $version = $pElem->attributes()->{'until-version'}) {
-                        $pMetadata->untilVersion = (string)$version;
+                        $pMetadata->untilVersion = (string) $version;
                     }
 
                     if (null !== $serializedName = $pElem->attributes()->{'serialized-name'}) {
-                        $pMetadata->serializedName = (string)$serializedName;
+                        $pMetadata->serializedName = (string) $serializedName;
                     }
 
                     if (null !== $type = $pElem->attributes()->type) {
-                        $pMetadata->setType((string)$type);
+                        $pMetadata->setType((string) $type);
                     } elseif (isset($pElem->type)) {
-                        $pMetadata->setType((string)$pElem->type);
+                        $pMetadata->setType((string) $pElem->type);
                     }
 
                     if (null !== $groups = $pElem->attributes()->groups) {
@@ -227,21 +227,21 @@ 
 
                         $colConfig = $pElem->{'xml-list'};
                         if (isset($colConfig->attributes()->inline)) {
-                            $pMetadata->xmlCollectionInline = 'true' === (string)$colConfig->attributes()->inline;
+                            $pMetadata->xmlCollectionInline = 'true' === (string) $colConfig->attributes()->inline;
                         }
 
                         if (isset($colConfig->attributes()->{'entry-name'})) {
-                            $pMetadata->xmlEntryName = (string)$colConfig->attributes()->{'entry-name'};
+                            $pMetadata->xmlEntryName = (string) $colConfig->attributes()->{'entry-name'};
                         }
 
                         if (isset($colConfig->attributes()->{'skip-when-empty'})) {
-                            $pMetadata->xmlCollectionSkipWhenEmpty = 'true' === (string)$colConfig->attributes()->{'skip-when-empty'};
+                            $pMetadata->xmlCollectionSkipWhenEmpty = 'true' === (string) $colConfig->attributes()->{'skip-when-empty'};
                         } else {
                             $pMetadata->xmlCollectionSkipWhenEmpty = true;
                         }
 
                         if (isset($colConfig->attributes()->namespace)) {
-                            $pMetadata->xmlEntryNamespace = (string)$colConfig->attributes()->namespace;
+                            $pMetadata->xmlEntryNamespace = (string) $colConfig->attributes()->namespace;
                         }
                     }
 
@@ -250,51 +250,51 @@ 
 
                         $colConfig = $pElem->{'xml-map'};
                         if (isset($colConfig->attributes()->inline)) {
-                            $pMetadata->xmlCollectionInline = 'true' === (string)$colConfig->attributes()->inline;
+                            $pMetadata->xmlCollectionInline = 'true' === (string) $colConfig->attributes()->inline;
                         }
 
                         if (isset($colConfig->attributes()->{'entry-name'})) {
-                            $pMetadata->xmlEntryName = (string)$colConfig->attributes()->{'entry-name'};
+                            $pMetadata->xmlEntryName = (string) $colConfig->attributes()->{'entry-name'};
                         }
 
                         if (isset($colConfig->attributes()->namespace)) {
-                            $pMetadata->xmlEntryNamespace = (string)$colConfig->attributes()->namespace;
+                            $pMetadata->xmlEntryNamespace = (string) $colConfig->attributes()->namespace;
                         }
 
                         if (isset($colConfig->attributes()->{'key-attribute-name'})) {
-                            $pMetadata->xmlKeyAttribute = (string)$colConfig->attributes()->{'key-attribute-name'};
+                            $pMetadata->xmlKeyAttribute = (string) $colConfig->attributes()->{'key-attribute-name'};
                         }
                     }
 
                     if (isset($pElem->{'xml-element'})) {
                         $colConfig = $pElem->{'xml-element'};
                         if (isset($colConfig->attributes()->cdata)) {
-                            $pMetadata->xmlElementCData = 'true' === (string)$colConfig->attributes()->cdata;
+                            $pMetadata->xmlElementCData = 'true' === (string) $colConfig->attributes()->cdata;
                         }
 
                         if (isset($colConfig->attributes()->namespace)) {
-                            $pMetadata->xmlNamespace = (string)$colConfig->attributes()->namespace;
+                            $pMetadata->xmlNamespace = (string) $colConfig->attributes()->namespace;
                         }
                     }
 
                     if (isset($pElem->attributes()->{'xml-attribute'})) {
-                        $pMetadata->xmlAttribute = 'true' === (string)$pElem->attributes()->{'xml-attribute'};
+                        $pMetadata->xmlAttribute = 'true' === (string) $pElem->attributes()->{'xml-attribute'};
                     }
 
                     if (isset($pElem->attributes()->{'xml-attribute-map'})) {
-                        $pMetadata->xmlAttributeMap = 'true' === (string)$pElem->attributes()->{'xml-attribute-map'};
+                        $pMetadata->xmlAttributeMap = 'true' === (string) $pElem->attributes()->{'xml-attribute-map'};
                     }
 
                     if (isset($pElem->attributes()->{'xml-value'})) {
-                        $pMetadata->xmlValue = 'true' === (string)$pElem->attributes()->{'xml-value'};
+                        $pMetadata->xmlValue = 'true' === (string) $pElem->attributes()->{'xml-value'};
                     }
 
                     if (isset($pElem->attributes()->{'xml-key-value-pairs'})) {
-                        $pMetadata->xmlKeyValuePairs = 'true' === (string)$pElem->attributes()->{'xml-key-value-pairs'};
+                        $pMetadata->xmlKeyValuePairs = 'true' === (string) $pElem->attributes()->{'xml-key-value-pairs'};
                     }
 
                     if (isset($pElem->attributes()->{'max-depth'})) {
-                        $pMetadata->maxDepth = (int)$pElem->attributes()->{'max-depth'};
+                        $pMetadata->maxDepth = (int) $pElem->attributes()->{'max-depth'};
                     }
 
                     //we need read-only before setter and getter set, because that method depends on flag being set
@@ -308,7 +308,7 @@ 
                     $setter = $pElem->attributes()->{'accessor-setter'};
                     $pMetadata->setAccessor(
                         (string) $pElem->attributes()->{'access-type'},
-                        $getter ? (string)$getter : null,
+                        $getter ? (string) $getter : null,
                         $setter ? (string) $setter : null,
                         (string) $pElem->attributes()->{'access-type-naming'}
                     );
@@ -319,8 +319,8 @@ 
 
                 }
 
-                if ((ExclusionPolicy::NONE === (string)$exclusionPolicy && !$isExclude)
-                    || (ExclusionPolicy::ALL === (string)$exclusionPolicy && $isExpose)
+                if ((ExclusionPolicy::NONE === (string) $exclusionPolicy && ! $isExclude)
+                    || (ExclusionPolicy::ALL === (string) $exclusionPolicy && $isExpose)
                 ) {
                     $metadata->addPropertyMetadata($pMetadata);
                 }
@@ -328,37 +328,37 @@ 
         }
 
         foreach ($elem->xpath('./callback-method') as $method) {
-            if (!isset($method->attributes()->type)) {
+            if ( ! isset($method->attributes()->type)) {
                 throw new RuntimeException('The type attribute must be set for all callback-method elements.');
             }
-            if (!isset($method->attributes()->name)) {
+            if ( ! isset($method->attributes()->name)) {
                 throw new RuntimeException('The name attribute must be set for all callback-method elements.');
             }
 
-            switch ((string)$method->attributes()->type) {
+            switch ((string) $method->attributes()->type) {
                 case 'pre-serialize':
-                    $metadata->addPreSerializeMethod(new MethodMetadata($name, (string)$method->attributes()->name));
+                    $metadata->addPreSerializeMethod(new MethodMetadata($name, (string) $method->attributes()->name));
                     break;
 
                 case 'post-serialize':
-                    $metadata->addPostSerializeMethod(new MethodMetadata($name, (string)$method->attributes()->name));
+                    $metadata->addPostSerializeMethod(new MethodMetadata($name, (string) $method->attributes()->name));
                     break;
 
                 case 'post-deserialize':
-                    $metadata->addPostDeserializeMethod(new MethodMetadata($name, (string)$method->attributes()->name));
+                    $metadata->addPostDeserializeMethod(new MethodMetadata($name, (string) $method->attributes()->name));
                     break;
 
                 case 'handler':
-                    if (!isset($method->attributes()->format)) {
+                    if ( ! isset($method->attributes()->format)) {
                         throw new RuntimeException('The format attribute must be set for "handler" callback methods.');
                     }
-                    if (!isset($method->attributes()->direction)) {
+                    if ( ! isset($method->attributes()->direction)) {
                         throw new RuntimeException('The direction attribute must be set for "handler" callback methods.');
                     }
 
-                    $direction = GraphNavigator::parseDirection((string)$method->attributes()->direction);
-                    $format = (string)$method->attributes()->format;
-                    $metadata->addHandlerCallback($direction, $format, (string)$method->attributes()->name);
+                    $direction = GraphNavigator::parseDirection((string) $method->attributes()->direction);
+                    $format = (string) $method->attributes()->format;
+                    $metadata->addHandlerCallback($direction, $format, (string) $method->attributes()->name);
 
                     break;
 

src/JMS/Serializer/Accessor/Updater/ClassAccessorUpdater.php

Spacing +4 added lines, -8 removed lines

@@ -63,10 +63,10 @@ 
     {
         switch ($naming) {
             case PropertyMetadata::ACCESS_TYPE_NAMING_CAMEL_CASE:
-                return $accessorPrefix . preg_replace('/_(\w)/', '\\1', $propertyName) ?: null;
+                return $accessorPrefix.preg_replace('/_(\w)/', '\\1', $propertyName) ?: null;
 
             case PropertyMetadata::ACCESS_TYPE_NAMING_EXACT:
-                return $accessorPrefix . $propertyName;
+                return $accessorPrefix.$propertyName;
         }
 
         throw new RuntimeException("Undefined naming type '$naming'.");
@@ -147,18 +147,14 @@ 
     protected function updateAccessors(PropertyMetadata $propertyMetadata, ClassMetadata $classMetadata)
     {
         $type =
-            $propertyMetadata->accessType ?:
-                $classMetadata->accessType ?:
-                    $this->defaultType;
+            $propertyMetadata->accessType ?: $classMetadata->accessType ?: $this->defaultType;
 
         if ($type !== PropertyMetadata::ACCESS_TYPE_PUBLIC_METHOD) {
             return;
         }
 
         $naming =
-            $propertyMetadata->accessTypeNaming ?:
-                $classMetadata->accessTypeNaming ?:
-                    $this->defaultNaming;
+            $propertyMetadata->accessTypeNaming ?: $classMetadata->accessTypeNaming ?: $this->defaultNaming;
 
         $propertyMetadata->setter = $propertyMetadata->setter ?: $this->getSetter($propertyMetadata, $naming);
         $propertyMetadata->getter = $propertyMetadata->getter ?: $this->getGetter($propertyMetadata, $naming);

Braces +1 added lines, -2 removed lines

@@ -34,8 +34,7 @@
         $defaultNaming = PropertyMetadata::ACCESS_TYPE_NAMING_EXACT,
         array $getterPrefixes = ['get', 'is', 'has'],
         array $setterPrefixes = ['set', 'update']
-    )
-    {
+    ) {
         $this->defaultType = $defaultType;
         $this->defaultNaming = $defaultNaming;
         $this->getterPrefixes = $getterPrefixes;