@@ -169,13 +169,13 @@ |
||
169 | 169 | $parentStr |
170 | 170 | ) = $unserialized; |
171 | 171 | |
172 | - if (isset($unserialized['xmlEntryNamespace'])){ |
|
172 | + if (isset($unserialized['xmlEntryNamespace'])) { |
|
173 | 173 | $this->xmlEntryNamespace = $unserialized['xmlEntryNamespace']; |
174 | 174 | } |
175 | - if (isset($unserialized['xmlCollectionSkipWhenEmpty'])){ |
|
175 | + if (isset($unserialized['xmlCollectionSkipWhenEmpty'])) { |
|
176 | 176 | $this->xmlCollectionSkipWhenEmpty = $unserialized['xmlCollectionSkipWhenEmpty']; |
177 | 177 | } |
178 | - if (isset($unserialized['excludeIf'])){ |
|
178 | + if (isset($unserialized['excludeIf'])) { |
|
179 | 179 | $this->excludeIf = $unserialized['excludeIf']; |
180 | 180 | } |
181 | 181 |
@@ -169,13 +169,13 @@ |
||
169 | 169 | $parentStr |
170 | 170 | ) = $unserialized; |
171 | 171 | |
172 | - if (isset($unserialized['xmlEntryNamespace'])){ |
|
172 | + if (isset($unserialized['xmlEntryNamespace'])) { |
|
173 | 173 | $this->xmlEntryNamespace = $unserialized['xmlEntryNamespace']; |
174 | 174 | } |
175 | - if (isset($unserialized['xmlCollectionSkipWhenEmpty'])){ |
|
175 | + if (isset($unserialized['xmlCollectionSkipWhenEmpty'])) { |
|
176 | 176 | $this->xmlCollectionSkipWhenEmpty = $unserialized['xmlCollectionSkipWhenEmpty']; |
177 | 177 | } |
178 | - if (isset($unserialized['excludeIf'])){ |
|
178 | + if (isset($unserialized['excludeIf'])) { |
|
179 | 179 | $this->excludeIf = $unserialized['excludeIf']; |
180 | 180 | } |
181 | 181 |
@@ -100,7 +100,7 @@ |
||
100 | 100 | $this->name |
101 | 101 | ) = $unserialized; |
102 | 102 | |
103 | - if (isset($unserialized['excludeIf'])){ |
|
103 | + if (isset($unserialized['excludeIf'])) { |
|
104 | 104 | $this->excludeIf = $unserialized['excludeIf']; |
105 | 105 | } |
106 | 106 | } |
@@ -100,7 +100,7 @@ |
||
100 | 100 | $this->name |
101 | 101 | ) = $unserialized; |
102 | 102 | |
103 | - if (isset($unserialized['excludeIf'])){ |
|
103 | + if (isset($unserialized['excludeIf'])) { |
|
104 | 104 | $this->excludeIf = $unserialized['excludeIf']; |
105 | 105 | } |
106 | 106 | } |
@@ -140,11 +140,11 @@ |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | if (null !== $excludeIf = $pElem->attributes()->{'exclude-if'}) { |
143 | - $pMetadata->excludeIf =$excludeIf; |
|
143 | + $pMetadata->excludeIf = $excludeIf; |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | if (null !== $excludeIf = $pElem->attributes()->{'expose-if'}) { |
147 | - $pMetadata->excludeIf = "!(" . $excludeIf .")"; |
|
147 | + $pMetadata->excludeIf = "!(".$excludeIf.")"; |
|
148 | 148 | $isExpose = true; |
149 | 149 | } |
150 | 150 |
@@ -159,7 +159,7 @@ |
||
159 | 159 | } elseif ($annot instanceof Expose) { |
160 | 160 | $isExpose = true; |
161 | 161 | if (null !== $annot->if) { |
162 | - $propertyMetadata->excludeIf = "!(" . $annot->if . ")"; |
|
162 | + $propertyMetadata->excludeIf = "!(".$annot->if.")"; |
|
163 | 163 | } |
164 | 164 | } elseif ($annot instanceof Exclude) { |
165 | 165 | if (null !== $annot->if) { |
@@ -19,7 +19,6 @@ |
||
19 | 19 | namespace JMS\Serializer\Metadata\Driver; |
20 | 20 | |
21 | 21 | use JMS\Serializer\Annotation\Discriminator; |
22 | -use JMS\Serializer\Annotation\ExcludeIf; |
|
23 | 22 | use JMS\Serializer\Annotation\XmlDiscriminator; |
24 | 23 | use JMS\Serializer\GraphNavigator; |
25 | 24 | use JMS\Serializer\Annotation\HandlerCallback; |
@@ -56,7 +56,7 @@ |
||
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 |
@@ -60,7 +60,7 @@ |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | if (($this->skipVirtualTypeInit && $virtualType) || |
63 | - (!$object instanceof Proxy && !$object instanceof ORMProxy) |
|
63 | + ( ! $object instanceof Proxy && ! $object instanceof ORMProxy) |
|
64 | 64 | ) { |
65 | 65 | return; |
66 | 66 | } |
@@ -205,7 +205,7 @@ |
||
205 | 205 | /** @var $metadata ClassMetadata */ |
206 | 206 | $metadata = $this->metadataFactory->getMetadataForClass($type['name']); |
207 | 207 | |
208 | - if ($metadata->usingExpression && !$this->expressionExclusionStrategy) { |
|
208 | + if ($metadata->usingExpression && ! $this->expressionExclusionStrategy) { |
|
209 | 209 | throw new ExpressionLanguageRequiredException("To use conditional exclude/expose in {$metadata->name} you must configure the expression language."); |
210 | 210 | } |
211 | 211 |
@@ -82,8 +82,7 @@ |
||
82 | 82 | ObjectConstructorInterface $objectConstructor, |
83 | 83 | EventDispatcherInterface $dispatcher = null, |
84 | 84 | ExpressionEvaluatorInterface $expressionEvaluator = null |
85 | - ) |
|
86 | - { |
|
85 | + ) { |
|
87 | 86 | $this->dispatcher = $dispatcher; |
88 | 87 | $this->metadataFactory = $metadataFactory; |
89 | 88 | $this->handlerRegistry = $handlerRegistry; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @param \PhpCollection\MapInterface $deserializationVisitors of VisitorInterface |
73 | 73 | * @param EventDispatcher\EventDispatcherInterface $dispatcher |
74 | 74 | * @param TypeParser $typeParser |
75 | - * @param ExpressionEvaluatorInterface $expressionLanguage |
|
75 | + * @param ExpressionEvaluatorInterface $expressionEvaluator |
|
76 | 76 | */ |
77 | 77 | public function __construct( |
78 | 78 | MetadataFactoryInterface $factory, |
@@ -179,6 +179,9 @@ discard block |
||
179 | 179 | ; |
180 | 180 | } |
181 | 181 | |
182 | + /** |
|
183 | + * @param string $format |
|
184 | + */ |
|
182 | 185 | private function visit(VisitorInterface $visitor, Context $context, $data, $format, array $type = null) |
183 | 186 | { |
184 | 187 | $context->initialize( |
@@ -83,8 +83,7 @@ |
||
83 | 83 | EventDispatcherInterface $dispatcher = null, |
84 | 84 | TypeParser $typeParser = null, |
85 | 85 | ExpressionEvaluatorInterface $expressionEvaluator = null |
86 | - ) |
|
87 | - { |
|
86 | + ) { |
|
88 | 87 | $this->factory = $factory; |
89 | 88 | $this->handlerRegistry = $handlerRegistry; |
90 | 89 | $this->objectConstructor = $objectConstructor; |
@@ -64,13 +64,13 @@ |
||
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 |