fixed some deprecation messages

fabpot · fabpot · commit 23e34431978a · 2017-12-31T06:50:45.000+01:00
diff --git a/Mapping/Factory/ClassMetadataFactory.php b/Mapping/Factory/ClassMetadataFactory.php
@@ -35,7 +35,7 @@ public function __construct(LoaderInterface $loader, Cache $cache = null)
         $this->cache = $cache;
 
         if (null !== $cache) {
-            @trigger_error(sprintf('Passing a Doctrine Cache instance as 2nd parameter of the "%s" constructor is deprecated since version 3.1. This parameter will be removed in Symfony 4.0. Use the "%s" class instead.', __CLASS__, CacheClassMetadataFactory::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing a Doctrine Cache instance as 2nd parameter of the "%s" constructor is deprecated since Symfony 3.1. This parameter will be removed in Symfony 4.0. Use the "%s" class instead.', __CLASS__, CacheClassMetadataFactory::class), E_USER_DEPRECATED);
         }
     }
 
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -313,7 +313,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @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);
+                    @trigger_error(sprintf('Method %s::%s() will have a 6th `string $format = null` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', get_class($this), __FUNCTION__), E_USER_DEPRECATED);
                 }
             }
 
diff --git a/Serializer.php b/Serializer.php
@@ -185,7 +185,7 @@ public function supportsNormalization($data, $format = null/*, array $context =
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a third `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a third `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 
@@ -206,7 +206,7 @@ public function supportsDenormalization($data, $type, $format = null/*, array $c
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a fourth `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a fourth `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 
@@ -306,7 +306,7 @@ public function supportsEncoding($format/*, array $context = array()*/)
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 
@@ -327,7 +327,7 @@ public function supportsDecoding($format/*, array $context = array()*/)
             if (__CLASS__ !== get_class($this)) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
-                    @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(LoaderInterface $loader, Cache $cache = null)`
`35`	`35`	`$this->cache = $cache;`
`36`	`36`
`37`	`37`	`if (null !== $cache) {`
`38`		`- @trigger_error(sprintf('Passing a Doctrine Cache instance as 2nd parameter of the "%s" constructor is deprecated since version 3.1. This parameter will be removed in Symfony 4.0. Use the "%s" class instead.', __CLASS__, CacheClassMetadataFactory::class), E_USER_DEPRECATED);`
	`38`	`+ @trigger_error(sprintf('Passing a Doctrine Cache instance as 2nd parameter of the "%s" constructor is deprecated since Symfony 3.1. This parameter will be removed in Symfony 4.0. Use the "%s" class instead.', __CLASS__, CacheClassMetadataFactory::class), E_USER_DEPRECATED);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`313`	`313`	`if (__CLASS__ !== get_class($this)) {`
`314`	`314`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`315`	`315`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`316`		- @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);
	`316`	+ @trigger_error(sprintf('Method %s::%s() will have a 6th `string $format = null` argument in version 4.0. Not defining it is deprecated since Symfony 3.2.', get_class($this), __FUNCTION__), E_USER_DEPRECATED);
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public function supportsNormalization($data, $format = null/*, array $context =`
`185`	`185`	`if (__CLASS__ !== get_class($this)) {`
`186`	`186`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`187`	`187`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`188`		- @trigger_error(sprintf('Method %s() will have a third `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
	`188`	+ @trigger_error(sprintf('Method %s() will have a third `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`@@ -206,7 +206,7 @@ public function supportsDenormalization($data, $type, $format = null/*, array $c`
`206`	`206`	`if (__CLASS__ !== get_class($this)) {`
`207`	`207`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`208`	`208`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`209`		- @trigger_error(sprintf('Method %s() will have a fourth `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
	`209`	+ @trigger_error(sprintf('Method %s() will have a fourth `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`@@ -306,7 +306,7 @@ public function supportsEncoding($format/, array $context = array()/)`
`306`	`306`	`if (__CLASS__ !== get_class($this)) {`
`307`	`307`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`308`	`308`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`309`		- @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
	`309`	+ @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`
`@@ -327,7 +327,7 @@ public function supportsDecoding($format/, array $context = array()/)`
`327`	`327`	`if (__CLASS__ !== get_class($this)) {`
`328`	`328`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`329`	`329`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`330`		- @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since 3.3.', __METHOD__), E_USER_DEPRECATED);
	`330`	+ @trigger_error(sprintf('Method %s() will have a second `$context = array()` argument in version 4.0. Not defining it is deprecated since Symfony 3.3.', __METHOD__), E_USER_DEPRECATED);
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`