Merge branch '3.3' into 3.4

fabpot · fabpot · commit 0cd9699d0f9f · 2017-12-31T07:07:31.000+01:00
* 3.3:
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  fixed some deprecation messages
  [2.7][DX] Use constant message contextualisation for deprecations
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
@@ -315,7 +315,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
@@ -196,7 +196,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);
                 }
             }
 
@@ -217,7 +217,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);
                 }
             }
 
@@ -291,7 +291,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);
                 }
             }
 
@@ -312,7 +312,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
`@@ -315,7 +315,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`315`	`315`	`if (__CLASS__ !== get_class($this)) {`
`316`	`316`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`317`	`317`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`318`		- @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);
	`318`	+ @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);
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function supportsNormalization($data, $format = null/*, array $context =`
`196`	`196`	`if (__CLASS__ !== get_class($this)) {`
`197`	`197`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`198`	`198`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`199`		- @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);
	`199`	+ @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);
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`@@ -217,7 +217,7 @@ public function supportsDenormalization($data, $type, $format = null/*, array $c`
`217`	`217`	`if (__CLASS__ !== get_class($this)) {`
`218`	`218`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`219`	`219`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`220`		- @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);
	`220`	+ @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);
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`@@ -291,7 +291,7 @@ public function supportsEncoding($format/, array $context = array()/)`
`291`	`291`	`if (__CLASS__ !== get_class($this)) {`
`292`	`292`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`293`	`293`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`294`		- @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);
	`294`	+ @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);
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`
`@@ -312,7 +312,7 @@ public function supportsDecoding($format/, array $context = array()/)`
`312`	`312`	`if (__CLASS__ !== get_class($this)) {`
`313`	`313`	`$r = new \ReflectionMethod($this, __FUNCTION__);`
`314`	`314`	`if (__CLASS__ !== $r->getDeclaringClass()->getName()) {`
`315`		- @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);
	`315`	+ @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);
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`