Merge branch '4.1'

* 4.1:
  {% if label is not same as(false) and required %}
  minor language tweak
  Update service_container.rst
  Fix wrong exception used in custom authentication provider example
  [Console] Replace useless usage of ContainerAwareCommand
  Shorten ternary operator
  Fix wrong usage in custom authenticator checking if password is invalid
  [Process] Fix typo in Process object initialization
  update hardcoded 5.1 version link
  Explain dump server usage outside of Symfony
  Add undocumented sortByAccessedTime, sortByChangedTime and sortByModifiedTime methods in finder component
  Update bugs.rst
  [#10200] remove trailing spaces
  action_method is missing $task variable
  [#10177] fix markup
  Clarifying when you need to or don't need to install the server bundle
  Fix bad link
  Update setup.rst
  Also requiring annotations so they can be used

Author: weaverryan

components/finder.rst

@@ -178,6 +178,14 @@ Sort the result by name or by type (directories first, then files)::
     .. versionadded:: 4.2
         The option to use the natural sort order was introduced in Symfony 4.2.
 
+Sort the files and directories by the last accessed, changed or modified time::
+
+    $finder->sortByAccessedTime();
+
+    $finder->sortByChangedTime();
+
+    $finder->sortByModifiedTime();
+
 You can also define your own sorting algorithm with ``sort()`` method::
 
     $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) {

components/process.rst

@@ -241,7 +241,7 @@ Before a process is started, you can specify its standard input using either the
 of the constructor. The provided input can be a string, a stream resource or a
 Traversable object::
 
-    $process = new Process('cat']);
+    $process = new Process('cat');
     $process->setInput('foobar');
     $process->run();
 

components/var_dumper.rst

@@ -119,6 +119,20 @@ Inside a Symfony application, the output of the dump server is configured with
 the :ref:`dump_destination option <configuration-debug-dump_destination>` of the
 ``debug`` package.
 
+Outside a Symfony application, use the ``ServerDumper`` class:
+
+    require __DIR__.'/vendor/autoload.php';
+    
+    use Symfony\Component\VarDumper\VarDumper;
+    use Symfony\Component\VarDumper\Cloner\VarCloner;
+    use Symfony\Component\VarDumper\Dumper\ServerDumper;
+    
+    VarDumper::setHandler(function ($var) {
+      $cloner = new VarCloner();
+      $dumper = new ServerDumper('tcp://127.0.0.1:9912');     
+      $dumper->dump($cloner->cloneVar($var));
+    });
+
 DebugBundle and Twig Integration
 --------------------------------
 

console/request_context.rst

@@ -78,12 +78,14 @@ router service and override its settings::
     use Symfony\Component\Routing\RouterInterface;
     // ...
 
-    class DemoCommand extends ContainerAwareCommand
+    class DemoCommand extends Command
     {
         private $router;
 
         public function __construct(RouterInterface $router)
         {
+            parent::__construct();
+        
             $this->router = $router;
         }
 

contributing/code/bugs.rst

@@ -44,7 +44,7 @@ If your problem definitely looks like a bug, report it using the official bug
 
 * *(optional)* Attach a :doc:`patch <patches>`.
 
-.. _`Stack Overflow`: https://stackoverflow.com/questions/tagged/symfony2
+.. _`Stack Overflow`: https://stackoverflow.com/questions/tagged/symfony
 .. _IRC channel: https://symfony.com/irc
 .. _the Symfony Slack: https://symfony.com/slack-invite
 .. _tracker: https://github.com/symfony/symfony/issues

create_framework/front_controller.rst

@@ -153,7 +153,7 @@ web root directory:
 Now, configure your web server root directory to point to ``web/`` and all
 other files won't be accessible from the client anymore.
 
-To test your changes in a browser (``http://localhost:4321/hello/?name=Fabien``), run
+To test your changes in a browser (``http://localhost:4321/hello?name=Fabien``), run
 the PHP built-in server:
 
 .. code-block:: terminal

form/action_method.rst

@@ -27,6 +27,8 @@ form, you can use ``setAction()`` and ``setMethod()``:
         {
             public function new()
             {
+                // ...
+
                 $form = $this->createFormBuilder($task)
                     ->setAction($this->generateUrl('target_route'))
                     ->setMethod('GET')

form/form_customization.rst

@@ -755,7 +755,7 @@ form, modify the ``use`` tag and add the following:
     {% block form_label %}
         {{ block('base_form_label') }}
 
-        {% if required %}
+        {% if label is not same as(false) and required %}
             <span class="required" title="This field is required">*</span>
         {% endif %}
     {% endblock %}
@@ -770,7 +770,7 @@ the following:
     {% block form_label %}
         {{ parent() }}
 
-        {% if required %}
+        {% if label is not same as(false) and required %}
             <span class="required" title="This field is required">*</span>
         {% endif %}
     {% endblock %}

page_creation.rst

@@ -176,15 +176,16 @@ To get a list of *all* of the routes in your system, use the ``debug:router`` co
 
     $ php bin/console debug:router
 
-You should see your `app_lucky_number` route at the very top:
+You should see your ``app_lucky_number`` route at the very top:
 
 ================== ======== ======== ====== ===============
  Name               Method   Scheme   Host   Path
 ================== ======== ======== ====== ===============
  app_lucky_number   ANY      ANY      ANY    /lucky/number
 ================== ======== ======== ====== ===============
 
-You will also see debugging routes below `app_lucky_number` -- more on the debugging routes in the next section.
+You will also see debugging routes below ``app_lucky_number`` -- more on
+the debugging routes in the next section.
 
 You'll learn about many more commands as you continue!
 

reference/forms/twig_reference.rst

@@ -322,7 +322,7 @@ done by using a public ``vars`` property on the
 .. code-block:: html+twig
 
     <label for="{{ form.name.vars.id }}"
-        class="{{ form.name.vars.required ? 'required' : '' }}">
+        class="{{ form.name.vars.required ? 'required' }}">
         {{ form.name.vars.label }}
     </label>
 

security/custom_authentication_provider.rst

@@ -206,7 +206,6 @@ the ``PasswordDigest`` header value matches with the user's password::
     use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
     use Symfony\Component\Security\Core\User\UserProviderInterface;
     use Symfony\Component\Security\Core\Exception\AuthenticationException;
-    use Symfony\Component\Security\Core\Exception\NonceExpiredException;
     use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
     use App\Security\Authentication\Token\WsseUserToken;
 
@@ -259,7 +258,9 @@ the ``PasswordDigest`` header value matches with the user's password::
             // Validate that the nonce is *not* in cache
             // if it is, this could be a replay attack
             if ($cacheItem->isHit()) {
-                throw new NonceExpiredException('Previously used nonce detected');
+                // In a real world application you should throw a custom
+                // exception extending the AuthenticationException
+                throw new AuthenticationException('Previously used nonce detected');
             }
 
             // Store the item in cache for 5 minutes

security/custom_password_authenticator.rst

@@ -63,7 +63,7 @@ the user::
                 if ('' === ($givenPassword = $token->getCredentials())) {
                     throw new BadCredentialsException('The given password cannot be empty.');
                 }
-                if (!$this->encoder->isPasswordValid($user->getPassword(), $givenPassword, $user->getSalt())) {
+                if (!$this->encoder->isPasswordValid($user, $givenPassword)) {
                     throw new BadCredentialsException('The given password is invalid.');
                 }
             }

service_container.rst

@@ -772,7 +772,7 @@ But, with ``autoconfigure: true``, you don't need the tag. In fact, if you're us
 the :ref:`default services.yaml config <service-container-services-load-example>`,
 you don't need to do *anything*: the service will be automatically loaded. Then,
 ``autoconfigure`` will add the ``twig.extension`` tag *for* you, because your class
-implements ``Twig\\Extension\\ExtensionInterface``. And thanks to ``autowire``, you can even add
+implements ``Twig\Extension\ExtensionInterface``. And thanks to ``autowire``, you can even add
 constructor arguments without any configuration.
 
 .. _container-public:

setup.rst

@@ -34,24 +34,22 @@ In other words, your new app is ready!
 
         $ composer create-project symfony/skeleton my-project
 
+        # optional: install the web server bundle (explained next)
+        $ cd my-project
+        $ composer require symfony/web-server-bundle --dev
+
 Running your Symfony Application
 --------------------------------
 
 On production, you should use a web server like Nginx or Apache
 (see :doc:`configuring a web server to run Symfony </setup/web_server_configuration>`).
 But for development, it's even easier to use the :doc:`Symfony PHP web server <setup/built_in_web_server>`.
 
-First, move into your new project and install the server:
+Move into your new project and start the server:
 
 .. code-block:: terminal
 
     $ cd my-project
-    $ composer require symfony/web-server-bundle --dev
-
-To start the server, run:
-
-.. code-block:: terminal
-
     $ php bin/console server:run
 
 Open your browser and navigate to ``http://localhost:8000/``. If everything is working,

setup/homestead.rst

@@ -75,5 +75,5 @@ developing your Symfony application!
 .. _Homestead: https://laravel.com/docs/homestead
 .. _Vagrant: https://www.vagrantup.com/
 .. _the Homestead documentation: https://laravel.com/docs/homestead#installation-and-setup
-.. _Daily Usage: https://laravel.com/docs/5.1/homestead#daily-usage
+.. _Daily Usage: https://laravel.com/docs/homestead#daily-usage
 .. _this blog post: https://www.whitewashing.de/2013/08/19/speedup_symfony2_on_vagrant_boxes.html

validation.rst

@@ -19,7 +19,7 @@ install the validator before using it:
 
 .. code-block:: terminal
 
-    $ composer require symfony/validator
+    $ composer require symfony/validator doctrine/annotations
 
 .. index::
    single: Validation; The basics