@@ -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) |
@@ -25,5 +25,7 @@ |
||
| 25 | 25 | const PRE_DESERIALIZE = 'serializer.pre_deserialize'; |
| 26 | 26 | const POST_DESERIALIZE = 'serializer.post_deserialize'; |
| 27 | 27 | |
| 28 | - final private function __construct() { } |
|
| 28 | + final private function __construct() |
|
| 29 | + { |
|
| 30 | +} |
|
| 29 | 31 | } |
@@ -167,7 +167,7 @@ |
||
| 167 | 167 | |
| 168 | 168 | //we need read_only before setter and getter set, because that method depends on flag being set |
| 169 | 169 | if (isset($pConfig['read_only'])) { |
| 170 | - $pMetadata->readOnly = (Boolean) $pConfig['read_only']; |
|
| 170 | + $pMetadata->readOnly = (Boolean) $pConfig['read_only']; |
|
| 171 | 171 | } else { |
| 172 | 172 | $pMetadata->readOnly = $pMetadata->readOnly || $readOnlyClass; |
| 173 | 173 | } |
@@ -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 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | |(.) |
| 50 | 50 | /x', |
| 51 | 51 | array(self::T_NAME => 'T_NAME', self::T_STRING => 'T_STRING', self::T_OPEN_BRACKET => 'T_OPEN_BRACKET', |
| 52 | - self::T_CLOSE_BRACKET => 'T_CLOSE_BRACKET', self::T_COMMA => 'T_COMMA', self::T_NONE => 'T_NONE'), |
|
| 52 | + self::T_CLOSE_BRACKET => 'T_CLOSE_BRACKET', self::T_COMMA => 'T_COMMA', self::T_NONE => 'T_NONE'), |
|
| 53 | 53 | function($value) { |
| 54 | 54 | switch ($value[0]) { |
| 55 | 55 | case '"': |
@@ -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 | } |
@@ -168,8 +168,8 @@ |
||
| 168 | 168 | |
| 169 | 169 | if ( ! $metadata->inline) { |
| 170 | 170 | $this->writer |
| 171 | - ->writeln(Inline::dump($name).':') |
|
| 172 | - ->indent(); |
|
| 171 | + ->writeln(Inline::dump($name).':') |
|
| 172 | + ->indent(); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | $this->setCurrentMetadata($metadata); |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
| 224 | - * @param array $groups |
|
| 224 | + * @param string[] $groups |
|
| 225 | 225 | * @param string $annotationSource |
| 226 | 226 | */ |
| 227 | 227 | private function sanitizeGroupNames($groups, $annotationSource) |
@@ -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?', |
@@ -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 | |
@@ -47,7 +47,8 @@ |
||
| 47 | 47 | * @param $metadataGroups |
| 48 | 48 | * @return bool |
| 49 | 49 | */ |
| 50 | - private function shouldSkipGroup($metadataGroups) { |
|
| 50 | + private function shouldSkipGroup($metadataGroups) |
|
| 51 | + { |
|
| 51 | 52 | if (false === $metadataGroups) { |
| 52 | 53 | return false; |
| 53 | 54 | } |