Skip to content

Commit 03f3c34

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Tweak the code to avoid fabbot false positives
2 parents b1098f8 + 2e1bdec commit 03f3c34

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Encoder/XmlEncoder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ private function buildXml(\DOMNode $parentNode, $data, string $xmlRootNodeName =
473473
return $this->appendNode($parentNode, $data, 'data');
474474
}
475475

476-
throw new NotEncodableValueException(sprintf('An unexpected value could not be serialized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
476+
throw new NotEncodableValueException('An unexpected value could not be serialized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
477477
}
478478

479479
/**

Serializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public function normalize($data, $format = null, array $context = [])
173173
throw new NotNormalizableValueException(sprintf('Could not normalize object of type "%s", no supporting normalizer found.', \get_class($data)));
174174
}
175175

176-
throw new NotNormalizableValueException(sprintf('An unexpected value could not be normalized: %s.', !\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
176+
throw new NotNormalizableValueException('An unexpected value could not be normalized: '.(!\is_resource($data) ? var_export($data, true) : sprintf('%s resource', get_resource_type($data))));
177177
}
178178

179179
/**

0 commit comments

Comments
 (0)