Merge branch '3.4'

* 3.4:
  Update custom_constraint.rst
  [#8087] fix merge
  Updated language for annouce event
  Update form best practises regarding Form::isValid
  Add form_theme in error customization
  [Routing]  is usable without SensioFrameworkBundle since 3.4
  Fix typo er(r)or
  Update questionhelper.rst
  Typo: lowercase letter
  Wrap the instantiation in parenthesis, and chain away
  fix variable being overwritten

Author: xabbuh

best_practices/controllers.rst

@@ -96,7 +96,7 @@ for the homepage of our app:
     namespace AppBundle\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class DefaultController extends Controller
     {
@@ -149,7 +149,7 @@ For example:
 .. code-block:: php
 
     use AppBundle\Entity\Post;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Component\Routing\Annotation\Route;
 
     /**
      * @Route("/{id}", name="admin_post_show")
@@ -202,9 +202,9 @@ flexible:
 .. code-block:: php
 
     use AppBundle\Entity\Post;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
     use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\Routing\Annotation\Route;
 
     /**
      * @Route("/comment/{postSlug}/new", name = "comment_new")

best_practices/forms.rst

@@ -204,7 +204,6 @@ and a ``createAction()`` that *only* processes the form submit. Both those
 actions will be almost identical. So it's much simpler to let ``newAction()``
 handle everything.
 
-Second, we recommend using ``$form->isSubmitted()`` in the ``if`` statement
-for clarity. This isn't technically needed, since ``isValid()`` first calls
-``isSubmitted()``. But without this, the flow doesn't read well as it *looks*
-like the form is *always* processed (even on the GET request).
+Second, is it required to call ``$form->isSubmitted()`` in the ``if`` statement
+before calling ``isValid()``. Calling ``isValid()`` with an unsubmitted form
+is deprecated since version 3.2 and will throw an exception in 4.0.

best_practices/security.rst

@@ -109,8 +109,8 @@ Using ``@Security``, this looks like:
 
 .. code-block:: php
 
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+    use Symfony\Component\Routing\Annotation\Route;
     // ...
 
     /**
@@ -135,8 +135,8 @@ method on the ``Post`` object:
 .. code-block:: php
 
     use AppBundle\Entity\Post;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+    use Symfony\Component\Routing\Annotation\Route;
 
     /**
      * @Route("/{id}/edit", name="admin_post_edit")
@@ -191,6 +191,7 @@ Now you can reuse this method both in the template and in the security expressio
 
     use AppBundle\Entity\Post;
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+    use Symfony\Component\Routing\Annotation\Route;
 
     /**
      * @Route("/{id}/edit", name="admin_post_edit")

components/console/helpers/questionhelper.rst

@@ -212,14 +212,15 @@ convenient for passwords::
     On Windows systems, this ``stty`` command may generate gibberish output and
     mangle the input text. If that's your case, disable it with this command::
 
+        use Symfony\Component\Console\Helper\QuestionHelper;
         use Symfony\Component\Console\Question\ChoiceQuestion;
 
         // ...
         public function execute(InputInterface $input, OutputInterface $output)
         {
             // ...
             $helper = $this->getHelper('question');
-            $helper->disableStty();
+            QuestionHelper::disableStty();
 
             // ...
         }

components/routing.rst

@@ -368,7 +368,7 @@ routes with UTF-8 characters:
         namespace AppBundle\Controller;
 
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+        use Symfony\Component\Routing\Annotation\Route;
 
         class DefaultController extends Controller
         {
@@ -442,7 +442,7 @@ You can also include UTF-8 strings as routing requirements:
         namespace AppBundle\Controller;
 
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+        use Symfony\Component\Routing\Annotation\Route;
 
         class DefaultController extends Controller
         {
@@ -508,7 +508,7 @@ You can also include UTF-8 strings as routing requirements:
         // ...
 
         return $collection;
-    
+
 .. tip::
 
     In addition to UTF-8 characters, the Routing component also supports all

configuration/micro_kernel_trait.rst

@@ -127,16 +127,9 @@ your ``composer.json`` file to load from there:
         }
     }
 
-Now, suppose you want to use Twig and load routes via annotations. For annotation
-routing, you need SensioFrameworkExtraBundle. This comes with a normal Symfony project.
-But in this case, you need to download it:
-
-.. code-block:: bash
-
-    $ composer require sensio/framework-extra-bundle
-
-Instead of putting *everything* in ``index.php``, create a new ``app/AppKernel.php``
-to hold the kernel. Now it looks like this::
+Now, suppose you want to use Twig and load routes via annotations. Instead of
+putting *everything* in ``index.php``, create a new ``app/AppKernel.php`` to
+hold the kernel. Now it looks like this::
 
     // app/AppKernel.php
 
@@ -161,7 +154,6 @@ to hold the kernel. Now it looks like this::
             $bundles = array(
                 new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
                 new Symfony\Bundle\TwigBundle\TwigBundle(),
-                new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle()
             );
 
             if ($this->getEnvironment() == 'dev') {
@@ -209,6 +201,12 @@ to hold the kernel. Now it looks like this::
         }
     }
 
+
+.. versionadded:: 3.4
+    Support for annotation routing without an external bundle was added in
+    Symfony 3.4. Prior to version 3.4, you needed to install the
+    SensioFrameworkExtraBundle.
+
 Unlike the previous kernel, this loads an external ``app/config/config.yml`` file,
 because the configuration started to get bigger:
 
@@ -261,7 +259,7 @@ has one file in it::
     namespace App\Controller;
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class MicroController extends Controller
     {

controller.rst

@@ -16,8 +16,8 @@ This renders a page that prints a lucky (random) number::
     // src/AppBundle/Controller/LuckyController.php
     namespace AppBundle\Controller;
 
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Symfony\Component\HttpFoundation\Response;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class LuckyController
     {
@@ -59,7 +59,7 @@ class::
     namespace AppBundle\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Component\Routing\Annotation\Route;
 
     class LuckyController
     {
@@ -325,7 +325,7 @@ controller's service config:
 
         // app/config/services.php
         use AppBundle\Controller\LuckyController;
-        
+
         $container->register(LuckyController::class)
             ->setPublic(true)
             ->addTag('controller.service_arguments', [
@@ -372,7 +372,7 @@ method. Here are several common services you might need::
     // you can also fetch parameters
     $someParameter = $this->getParameter('some_parameter');
 
-If you receive an eror like:
+If you receive an error like:
 
 .. code-block:: text
 

controller/service.rst

@@ -34,6 +34,9 @@ syntax:
     .. code-block:: php-annotations
 
         # src/AppBundle/Controller/HelloController.php
+
+        // You need to use Sensio's annotation to specify a service id
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
         // ...
 
         /**

controller/soap_web_service.rst

@@ -61,7 +61,7 @@ can be retrieved via ``/soap?wsdl``::
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Response;
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Component\Routing\Annotation\Route;
     use AppBundle\Service\HelloService;
 
     class HelloServiceController extends Controller

controller/upload_file.rst

@@ -110,9 +110,9 @@ Finally, you need to update the code of the controller that handles the form::
     // src/AppBundle/Controller/ProductController.php
     namespace AppBundle\ProductController;
 
-    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\Routing\Annotation\Route;
     use AppBundle\Entity\Product;
     use AppBundle\Form\ProductType;