Merge branch '4.1'

* 4.1:
  Removed the Action suffix in controller methods
  Update form_login_setup.rst
  [Form][Validation] User $user instead of $users
  fix server status and stop command descriptions
  Added 'Default' validation group
  Update Callback.rst
  [Encore] unify the name of app file

Author: javiereguiluz

form/validation_groups.rst

@@ -10,7 +10,7 @@ Validation Groups
 If your object takes advantage of :doc:`validation groups </validation/groups>`,
 you'll need to specify which validation group(s) your form should use::
 
-    $form = $this->createFormBuilder($users, array(
+    $form = $this->createFormBuilder($user, array(
         'validation_groups' => array('registration'),
     ))->add(...);
 
@@ -28,4 +28,7 @@ method::
     }
 
 In both of these cases, *only* the ``registration`` validation group will
-be used to validate the underlying object.
+be used to validate the underlying object. To apply the ``registration``
+group *and* all constraints that are not in a group, use::
+
+    'validation_groups' => array('Default', 'registration')

frontend/encore/advanced-config.rst

@@ -53,7 +53,7 @@ state of the current configuration to build a new one:
     Encore
         .setOutputPath('public/build/')
         .setPublicPath('/build')
-        .addEntry('app', './assets/js/main.js')
+        .addEntry('app', './assets/js/app.js')
         .addStyleEntry('global', './assets/css/global.scss')
         .enableSassLoader()
         .autoProvidejQuery()

frontend/encore/page-specific-assets.rst

@@ -14,7 +14,7 @@ a new ``checkout`` entry:
 
     Encore
         // an existing entry
-        .addEntry('app', './assets/js/main.js')
+        .addEntry('app', './assets/js/app.js')
         // a global styles entry
         .addStyleEntry('global', './assets/css/global.scss')
 

frontend/encore/shared-entry.rst

@@ -13,8 +13,8 @@ Update your code to use ``createSharedEntry()``:
 
     Encore
         // ...
-    -     .addEntry('app', 'assets/js/app.js')
-    +     .createSharedEntry('app', 'assets/js/app.js')
+    -     .addEntry('app', './assets/js/app.js')
+    +     .createSharedEntry('app', './assets/js/app.js')
         .addEntry('homepage', './assets/js/homepage.js')
         .addEntry('blog', './assets/js/blog.js')
         .addEntry('store', './assets/js/store.js')

reference/constraints/Callback.rst

@@ -272,7 +272,7 @@ Concrete callbacks receive an :class:`Symfony\\Component\\Validator\\Context\\Ex
 instance as only argument.
 
 Static or closure callbacks receive the validated object as the first argument
-and the :class:`Symfony\\Component\\Validator\\ExecutionContextInterface`
+and the :class:`Symfony\\Component\\Validator\\Context\\ExecutionContextInterface`
 instance as the second argument.
 
 .. include:: /reference/constraints/_payload-option.rst.inc

setup/built_in_web_server.rst

@@ -56,17 +56,12 @@ can change the socket passing an IP address and a port as a command-line argumen
 .. note::
 
     You can use the ``server:status`` command to check if a web server is
-    listening on a certain socket:
+    listening:
 
     .. code-block:: terminal
 
         $ php bin/console server:status
 
-        $ php bin/console server:status 192.168.0.1:8080
-
-    The first command shows if your Symfony application will be served through
-    ``localhost:8000``, the second one does the same for ``192.168.0.1:8080``.
-
 .. tip::
 
     Some systems do not support the ``server:start`` command, in these cases
@@ -121,13 +116,5 @@ command:
 
     $ php bin/console server:stop
 
-Like with the start command, if you omit the socket information, Symfony will
-stop the web server bound to ``localhost:8000``. Just pass the socket information
-when the web server listens to another IP address or to another port:
-
-.. code-block:: terminal
-
-    $ php bin/console server:stop 192.168.0.1:8080
-
 .. _`built-in web server`: https://php.net/manual/en/features.commandline.webserver.php
 .. _`php.net`: https://php.net/manual/en/features.commandline.webserver.php#example-411