fixed some deprecation messages

fabpot · fabpot · commit 2f0f4e787e53 · 2017-12-31T06:12:25.000+01:00
diff --git a/ChoiceList/ArrayKeyChoiceList.php b/ChoiceList/ArrayKeyChoiceList.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Form\ChoiceList;
 
-@trigger_error('The '.__NAMESPACE__.'\ArrayKeyChoiceList class is deprecated since version 2.8 and will be removed in 3.0. Use '.__NAMESPACE__.'\ArrayChoiceList instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ArrayKeyChoiceList class is deprecated since Symfony 2.8 and will be removed in 3.0. Use '.__NAMESPACE__.'\ArrayChoiceList instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 
diff --git a/Extension/Core/Type/ChoiceType.php b/Extension/Core/Type/ChoiceType.php
@@ -354,7 +354,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $choicesAsValuesNormalizer = function (Options $options, $choicesAsValues) use ($that) {
             if (true !== $choicesAsValues && null === $options['choice_loader']) {
-                @trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since version 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
+                @trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since Symfony 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);
             }
 
             return $choicesAsValues;
diff --git a/Extension/Core/Type/CollectionType.php b/Extension/Core/Type/CollectionType.php
@@ -89,14 +89,14 @@ public function configureOptions(OptionsResolver $resolver)
         };
         $optionsNormalizer = function (Options $options, $value) use ($entryOptionsNormalizer) {
             if (null !== $value) {
-                @trigger_error('The form option "options" is deprecated since version 2.8 and will be removed in 3.0. Use "entry_options" instead.', E_USER_DEPRECATED);
+                @trigger_error('The form option "options" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "entry_options" instead.', E_USER_DEPRECATED);
             }
 
             return $entryOptionsNormalizer($options, $value);
         };
         $typeNormalizer = function (Options $options, $value) {
             if (null !== $value) {
-                @trigger_error('The form option "type" is deprecated since version 2.8 and will be removed in 3.0. Use "entry_type" instead.', E_USER_DEPRECATED);
+                @trigger_error('The form option "type" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "entry_type" instead.', E_USER_DEPRECATED);
             }
 
             return $value;
diff --git a/Extension/Core/Type/FormType.php b/Extension/Core/Type/FormType.php
@@ -199,7 +199,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $readOnlyNormalizer = function (Options $options, $readOnly) {
             if (null !== $readOnly) {
-                @trigger_error('The form option "read_only" is deprecated since version 2.8 and will be removed in 3.0. Use "attr[\'readonly\']" instead.', E_USER_DEPRECATED);
+                @trigger_error('The form option "read_only" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "attr[\'readonly\']" instead.', E_USER_DEPRECATED);
 
                 return $readOnly;
             }
diff --git a/Extension/Core/Type/TimezoneType.php b/Extension/Core/Type/TimezoneType.php
@@ -73,7 +73,7 @@ public function getBlockPrefix()
      */
     public static function getTimezones()
     {
-        @trigger_error('The TimezoneType::getTimezones() method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The TimezoneType::getTimezones() method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if (null === static::$timezones) {
             static::$timezones = array();
diff --git a/Extension/Csrf/Type/FormTypeCsrfExtension.php b/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -121,7 +121,7 @@ public function configureOptions(OptionsResolver $resolver)
         // BC clause for the "intention" option
         $csrfTokenId = function (Options $options) {
             if (null !== $options['intention']) {
-                @trigger_error('The form option "intention" is deprecated since version 2.8 and will be removed in 3.0. Use "csrf_token_id" instead.', E_USER_DEPRECATED);
+                @trigger_error('The form option "intention" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "csrf_token_id" instead.', E_USER_DEPRECATED);
             }
 
             return $options['intention'];
@@ -141,7 +141,7 @@ public function configureOptions(OptionsResolver $resolver)
         $defaultTokenManager = $this->defaultTokenManager;
         $csrfProviderNormalizer = function (Options $options, $csrfProvider) use ($defaultTokenManager) {
             if (null !== $csrfProvider) {
-                @trigger_error('The form option "csrf_provider" is deprecated since version 2.8 and will be removed in 3.0. Use "csrf_token_manager" instead.', E_USER_DEPRECATED);
+                @trigger_error('The form option "csrf_provider" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "csrf_token_manager" instead.', E_USER_DEPRECATED);
 
                 return $csrfProvider;
             }
diff --git a/Extension/Validator/EventListener/ValidationListener.php b/Extension/Validator/EventListener/ValidationListener.php
@@ -47,7 +47,7 @@ public function __construct($validator, ViolationMapperInterface $violationMappe
         }
 
         if (!$validator instanceof ValidatorInterface) {
-            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
+            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
         }
 
         $this->validator = $validator;
diff --git a/Extension/Validator/Type/FormTypeValidatorExtension.php b/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -62,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver)
 
         $cascadeValidationNormalizer = function (Options $options, $cascadeValidation) {
             if (null !== $cascadeValidation) {
-                @trigger_error('The "cascade_validation" option is deprecated since version 2.8 and will be removed in 3.0. Use "constraints" with a Valid constraint instead.', E_USER_DEPRECATED);
+                @trigger_error('The "cascade_validation" option is deprecated since Symfony 2.8 and will be removed in 3.0. Use "constraints" with a Valid constraint instead.', E_USER_DEPRECATED);
             }
 
             return null === $cascadeValidation ? false : $cascadeValidation;
diff --git a/Extension/Validator/ValidatorExtension.php b/Extension/Validator/ValidatorExtension.php
@@ -40,7 +40,7 @@ public function __construct($validator)
             $metadata = $validator->getMetadataFor('Symfony\Component\Form\Form');
         // 2.4 API
         } elseif ($validator instanceof LegacyValidatorInterface) {
-            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
+            @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);
             $metadata = $validator->getMetadataFactory()->getMetadataFor('Symfony\Component\Form\Form');
         } else {
             throw new UnexpectedTypeException($validator, 'Symfony\Component\Validator\Validator\ValidatorInterface or Symfony\Component\Validator\ValidatorInterface');
diff --git a/FormFactory.php b/FormFactory.php
@@ -94,12 +94,12 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens
         }
 
         if ($type instanceof FormTypeInterface) {
-            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since Symfony 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);
             $type = $this->resolveType($type);
         } elseif (is_string($type)) {
             $type = $this->registry->getType($type);
         } elseif ($type instanceof ResolvedFormTypeInterface) {
-            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since Symfony 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);
         } else {
             throw new UnexpectedTypeException($type, 'string, Symfony\Component\Form\ResolvedFormTypeInterface or Symfony\Component\Form\FormTypeInterface');
         }
diff --git a/FormRegistry.php b/FormRegistry.php
@@ -98,7 +98,7 @@ public function getType($name)
         }
 
         if (isset($this->legacyNames[$name])) {
-            @trigger_error(sprintf('Accessing type "%s" by its string name is deprecated since version 2.8 and will be removed in 3.0. Use the fully-qualified type class name "%s" instead.', $name, get_class($this->types[$name]->getInnerType())), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Accessing type "%s" by its string name is deprecated since Symfony 2.8 and will be removed in 3.0. Use the fully-qualified type class name "%s" instead.', $name, get_class($this->types[$name]->getInnerType())), E_USER_DEPRECATED);
         }
 
         return $this->types[$name];
@@ -121,7 +121,7 @@ private function resolveAndAddType(FormTypeInterface $type)
         $hasCustomName = $name !== $fqcn;
 
         if ($parentType instanceof FormTypeInterface) {
-            @trigger_error(sprintf('Returning a FormTypeInterface from %s::getParent() is deprecated since version 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', $fqcn), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Returning a FormTypeInterface from %s::getParent() is deprecated since Symfony 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', $fqcn), E_USER_DEPRECATED);
 
             $this->resolveAndAddType($parentType);
             $parentType = $parentType->getName();
@@ -130,7 +130,7 @@ private function resolveAndAddType(FormTypeInterface $type)
         if ($hasCustomName) {
             foreach ($this->extensions as $extension) {
                 if ($x = $extension->getTypeExtensions($name)) {
-                    @trigger_error(sprintf('Returning a type name from %s::getExtendedType() is deprecated since version 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', get_class($x[0])), E_USER_DEPRECATED);
+                    @trigger_error(sprintf('Returning a type name from %s::getExtendedType() is deprecated since Symfony 2.8 and will be removed in 3.0. Return the fully-qualified type class name instead.', get_class($x[0])), E_USER_DEPRECATED);
 
                     $typeExtensions = array_merge($typeExtensions, $x);
                 }
@@ -165,7 +165,7 @@ private function resolveAndAddType(FormTypeInterface $type)
     public function hasType($name)
     {
         if (isset($this->legacyNames[$name])) {
-            @trigger_error(sprintf('Accessing type "%s" by its string name is deprecated since version 2.8 and will be removed in 3.0. Use the fully-qualified type class name "%s" instead.', $name, get_class($this->types[$name]->getInnerType())), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Accessing type "%s" by its string name is deprecated since Symfony 2.8 and will be removed in 3.0. Use the fully-qualified type class name "%s" instead.', $name, get_class($this->types[$name]->getInnerType())), E_USER_DEPRECATED);
         }
 
         if (isset($this->types[$name])) {
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
@@ -71,7 +71,7 @@ public function __construct(FormTypeInterface $innerType, array $typeExtensions
             // Anyone else should only override getBlockPrefix() if they actually
             // want to have a different block prefix than the default one
             if ($isOldOverwritten && !$isNewOverwritten) {
-                @trigger_error(get_class($innerType).': The FormTypeInterface::getName() method is deprecated since version 2.8 and will be removed in 3.0. Remove it from your classes. Use getBlockPrefix() if you want to customize the template block prefix. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
+                @trigger_error(get_class($innerType).': The FormTypeInterface::getName() method is deprecated since Symfony 2.8 and will be removed in 3.0. Remove it from your classes. Use getBlockPrefix() if you want to customize the template block prefix. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
             }
 
             $blockPrefix = $innerType->getBlockPrefix();

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public function configureOptions(OptionsResolver $resolver)`
`354`	`354`
`355`	`355`	`$choicesAsValuesNormalizer = function (Options $options, $choicesAsValues) use ($that) {`
`356`	`356`	`if (true !== $choicesAsValues && null === $options['choice_loader']) {`
`357`		`- @trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since version 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);`
	`357`	`+ @trigger_error(sprintf('The value "false" for the "choices_as_values" option of the "%s" form type (%s) is deprecated since Symfony 2.8 and will not be supported anymore in 3.0. Set this option to "true" and flip the contents of the "choices" option instead.', $that->getName(), __CLASS__), E_USER_DEPRECATED);`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`return $choicesAsValues;`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ public function configureOptions(OptionsResolver $resolver)`
`199`	`199`
`200`	`200`	`$readOnlyNormalizer = function (Options $options, $readOnly) {`
`201`	`201`	`if (null !== $readOnly) {`
`202`		`- @trigger_error('The form option "read_only" is deprecated since version 2.8 and will be removed in 3.0. Use "attr[\'readonly\']" instead.', E_USER_DEPRECATED);`
	`202`	`+ @trigger_error('The form option "read_only" is deprecated since Symfony 2.8 and will be removed in 3.0. Use "attr[\'readonly\']" instead.', E_USER_DEPRECATED);`
`203`	`203`
`204`	`204`	`return $readOnly;`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function getBlockPrefix()`
`73`	`73`	`*/`
`74`	`74`	`public static function getTimezones()`
`75`	`75`	`{`
`76`		`- @trigger_error('The TimezoneType::getTimezones() method is deprecated since version 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`76`	`+ @trigger_error('The TimezoneType::getTimezones() method is deprecated since Symfony 2.8 and will be removed in 3.0.', E_USER_DEPRECATED);`
`77`	`77`
`78`	`78`	`if (null === static::$timezones) {`
`79`	`79`	`static::$timezones = array();`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct($validator, ViolationMapperInterface $violationMappe`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (!$validator instanceof ValidatorInterface) {`
`50`		`- @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since version 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);`
	`50`	`+ @trigger_error('Passing an instance of Symfony\Component\Validator\ValidatorInterface as argument to the '.__METHOD__.' method is deprecated since Symfony 2.8 and will be removed in 3.0. Use an implementation of Symfony\Component\Validator\Validator\ValidatorInterface instead', E_USER_DEPRECATED);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`$this->validator = $validator;`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver)`
`62`	`62`
`63`	`63`	`$cascadeValidationNormalizer = function (Options $options, $cascadeValidation) {`
`64`	`64`	`if (null !== $cascadeValidation) {`
`65`		`- @trigger_error('The "cascade_validation" option is deprecated since version 2.8 and will be removed in 3.0. Use "constraints" with a Valid constraint instead.', E_USER_DEPRECATED);`
	`65`	`+ @trigger_error('The "cascade_validation" option is deprecated since Symfony 2.8 and will be removed in 3.0. Use "constraints" with a Valid constraint instead.', E_USER_DEPRECATED);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`return null === $cascadeValidation ? false : $cascadeValidation;`
Original file line number	Diff line number	Diff line change
`@@ -94,12 +94,12 @@ public function createNamedBuilder($name, $type = 'Symfony\Component\Form\Extens`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if ($type instanceof FormTypeInterface) {`
`97`		`- @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);`
	`97`	`+ @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since Symfony 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type)), E_USER_DEPRECATED);`
`98`	`98`	`$type = $this->resolveType($type);`
`99`	`99`	`} elseif (is_string($type)) {`
`100`	`100`	`$type = $this->registry->getType($type);`
`101`	`101`	`} elseif ($type instanceof ResolvedFormTypeInterface) {`
`102`		`- @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);`
	`102`	`+ @trigger_error(sprintf('Passing type instances to FormBuilder::add(), Form::add() or the FormFactory is deprecated since Symfony 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead (%s).', get_class($type->getInnerType())), E_USER_DEPRECATED);`
`103`	`103`	`} else {`
`104`	`104`	`throw new UnexpectedTypeException($type, 'string, Symfony\Component\Form\ResolvedFormTypeInterface or Symfony\Component\Form\FormTypeInterface');`
`105`	`105`	`}`