Merge branch '2.7'

* 2.7:
  added type-hint
  [Security] removed usage of the deprecated SecurityContextInterface
  [Form] fixed deprecation triggers, removed usage of deprecated features
  [EventDispatcher] fixed deprecation notices in the EventDispatcher Component
  [HttpFoundation] maked a test as being for deprecated feature
  added missing error_reporting
  [Yaml] maked a test as being for deprecated feature
  [Yaml] removed deprecation notices on internal constant
  [Security] moved test files into the right place
  [HttpKernel] fixed deprecation notices for ESI classes
  [Form] moved a deprecation notice
  [Form] fixed the CSRF extension to allow using only the new interfaces
  [Form] tweaked a deprecation message
  [Validator] Add a Russian translation for the checkDNS option in the URL validator
  [Validator] Add a Slovenian translation for the checkDNS option in the URL validator
  [Validator] Add a Polish translation for the checkDNS option in the URL validator.
  fixed typo
  added missing support for factories in console descriptions
  [FrameworkBundle] fixed missing information in some descriptors

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
	src/Symfony/Component/Yaml/Tests/YamlTest.php

Author: fabpot

Exception/AlreadyBoundException.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Exception;
 
-trigger_error('The '.__NAMESPACE__.'\AlreadyBoundException class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Exception\AlreadySubmittedException class instead.', E_USER_DEPRECATED);
-
 /**
  * Alias of {@link AlreadySubmittedException}.
  *
@@ -21,4 +19,12 @@
  */
 class AlreadyBoundException extends LogicException
 {
+    public function __construct($message = '', $code = 0, \Exception $previous = null)
+    {
+        if (__CLASS__ === get_class($this)) {
+            trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Exception\AlreadySubmittedException class instead.', E_USER_DEPRECATED);
+        }
+
+        parent::__construct($message, $code, $previous);
+    }
 }

Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Form\Extension\Csrf\CsrfProvider;
 
-trigger_error('The '.__NAMESPACE__.'\CsrfTokenManagerAdapter is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
-
 use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
@@ -36,8 +34,12 @@ public function __construct(CsrfTokenManagerInterface $tokenManager)
         $this->tokenManager = $tokenManager;
     }
 
-    public function getTokenManager()
+    public function getTokenManager($triggerDeprecationError = true)
     {
+        if ($triggerDeprecationError) {
+            trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+        }
+
         return $this->tokenManager;
     }
 
@@ -46,6 +48,8 @@ public function getTokenManager()
      */
     public function generateCsrfToken($intention)
     {
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+
         return $this->tokenManager->getToken($intention)->getValue();
     }
 
@@ -54,6 +58,8 @@ public function generateCsrfToken($intention)
      */
     public function isCsrfTokenValid($intention, $token)
     {
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in version 3.0. Use the Symfony\Component\Security\Csrf\CsrfTokenManager class instead.', E_USER_DEPRECATED);
+
         return $this->tokenManager->isTokenValid(new CsrfToken($intention, $token));
     }
 }

Extension/Csrf/Type/FormTypeCsrfExtension.php

@@ -128,8 +128,12 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
 
         // BC clause for the "csrf_provider" option
         $csrfTokenManager = function (Options $options) {
+            if ($options['csrf_provider'] instanceof CsrfTokenManagerInterface) {
+                return $options['csrf_provider'];
+            }
+
             return $options['csrf_provider'] instanceof CsrfTokenManagerAdapter
-                ? $options['csrf_provider']->getTokenManager()
+                ? $options['csrf_provider']->getTokenManager(false)
                 : new CsrfProviderAdapter($options['csrf_provider']);
         };
 
@@ -139,7 +143,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'csrf_message' => 'The CSRF token is invalid. Please try to resubmit the form.',
             'csrf_token_manager' => $csrfTokenManager,
             'csrf_token_id' => $csrfTokenId,
-            'csrf_provider' => new CsrfTokenManagerAdapter($this->defaultTokenManager),
+            'csrf_provider' => $this->defaultTokenManager,
             'intention' => null,
         ));
     }

Extension/Validator/ViolationMapper/ViolationMapper.php

@@ -127,8 +127,8 @@ public function mapViolation(ConstraintViolation $violation, FormInterface $form
             $scope->addError(new FormError(
                 $violation->getMessage(),
                 $violation->getMessageTemplate(),
-                $violation->getMessageParameters(),
-                $violation->getMessagePluralization(),
+                $violation->getParameters(),
+                $violation->getPlural(),
                 $violation
             ));
         }

Form.php

@@ -848,7 +848,7 @@ public function getErrors($deep = false, $flatten = true)
      */
     public function getErrorsAsString($level = 0)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use the Form::getErrors(true, false) method instead and cast the result to a string.', E_USER_DEPRECATED);
+        trigger_error('The '.__METHOD__.' method is deprecated since version 2.5 and will be removed in 3.0. Use (string) Form::getErrors(true, false) instead.', E_USER_DEPRECATED);
 
         return self::indent((string) $this->getErrors(true, false), $level);
     }

Tests/CompoundFormTest.php

@@ -787,8 +787,10 @@ public function testSubmitGetRequestWithEmptyRootFormName()
         $this->assertEquals(array('extra' => 'data'), $form->getExtraData());
     }
 
-    public function testGetErrorsAsStringDeep()
+    public function testLegacyGetErrorsAsStringDeep()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $parent = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())
@@ -806,8 +808,10 @@ public function testGetErrorsAsStringDeep()
         );
     }
 
-    public function testGetErrorsAsStringDeepWithIndentation()
+    public function testLegacyGetErrorsAsStringDeepWithIndentation()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $parent = $this->getBuilder()
             ->setCompound(true)
             ->setDataMapper($this->getDataMapper())

Tests/Extension/Core/Type/FormTypeTest.php

@@ -637,8 +637,10 @@ public function testPassZeroLabelToView()
         $this->assertSame('0', $view->vars['label']);
     }
 
-    public function testCanGetErrorsWhenButtonInForm()
+    public function testLegacyCanGetErrorsWhenButtonInForm()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $builder = $this->factory->createBuilder('form', null, array(
             'data_class' => 'Symfony\Component\Form\Tests\Fixtures\Author',
             'required' => false,

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -575,7 +575,7 @@ public function testNoViolationIfAllowExtraData()
             ->add($this->getBuilder('child'))
             ->getForm();
 
-        $form->bind(array('foo' => 'bar'));
+        $form->submit(array('foo' => 'bar'));
 
         $context->expects($this->never())
             ->method('addViolation');

Tests/SimpleFormTest.php

@@ -732,8 +732,10 @@ public function testCreateViewWithExplicitParent()
         $this->assertSame($view, $form->createView($parentView));
     }
 
-    public function testGetErrorsAsString()
+    public function testLegacyGetErrorsAsString()
     {
+        $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);
+
         $this->form->addError(new FormError('Error!'));
 
         $this->assertEquals("ERROR: Error!\n", $this->form->getErrorsAsString());