Skip to content

Commit aa97f75

Browse files
Merge branch '3.3' into 3.4
* 3.3: [PhpUnitBridge] remove unused use statement do not mock a deprecated interface [DI] Added missing deprecation in changelog [Ldap] add a changelog file [Security][Serializer][DI] Add new arguments typehints in preparation for 4.0 [MonologBridge] Fix the Monlog ServerLogHandler from Hanging on Windows [DependencyInjection] Fix dumping of RewindableGenerator with empty IteratorArgument [DI][Serializer] Fix missing de(normalizer|coder) autoconfig Use 0.0.0.0 as the server log host default.
2 parents 54c7a4b + 30ff144 commit aa97f75

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Normalizer/AbstractNormalizer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,15 +302,15 @@ protected function getConstructor(array &$data, $class, array &$context, \Reflec
302302
*
303303
* @throws RuntimeException
304304
*/
305-
protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes/*, $format = null*/)
305+
protected function instantiateObject(array &$data, $class, array &$context, \ReflectionClass $reflectionClass, $allowedAttributes/*, string $format = null*/)
306306
{
307307
if (func_num_args() >= 6) {
308308
$format = func_get_arg(5);
309309
} else {
310310
if (__CLASS__ !== get_class($this)) {
311311
$r = new \ReflectionMethod($this, __FUNCTION__);
312312
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
313-
@trigger_error(sprintf('Method %s::%s() will have a 6th `$format = null` argument in version 4.0. Not defining it is deprecated since 3.2.', get_class($this), __FUNCTION__), E_USER_DEPRECATED);
313+
@trigger_error(sprintf('Method %s::%s() will have a 6th `string $format = null` argument in version 4.0. Not defining it is deprecated since 3.2.', get_class($this), __FUNCTION__), E_USER_DEPRECATED);
314314
}
315315
}
316316

0 commit comments

Comments
 (0)