Merge branch '3.1' into 3.2

* 3.1:
  [#7410] fix console binary path after merge
  Fix the command for validating the schema
  Fix typo in Doctrine doc
  revise deprecated bowerphp link
  Use the international signup page instead of the local one
  Update sing up link to the Azure cloud plattform
  Add missing use statement
  Fix missing key for time-sensitive tests
  Reworded some explanations and expanded examples
  Fixed typo - changed it's to its
  Use preferred spelling for "cannot"
  Fix explanation of custom placeholder
  Fix invalid ProgressBar message examples

Author: xabbuh

components/console/helpers/progressbar.rst

@@ -170,7 +170,7 @@ current progress of the bar. Here is a list of the built-in placeholders:
 * ``remaining``: The remaining time to complete the task (not available if no max is defined);
 * ``estimated``: The estimated time to complete the task (not available if no max is defined);
 * ``memory``: The current memory usage;
-* ``message``: The current message attached to the progress bar.
+* ``message``: used to display arbitrary messages in the progress bar (as explained later).
 
 For instance, here is how you could set the format to be the same as the
 ``debug`` one::
@@ -181,20 +181,6 @@ Notice the ``:6s`` part added to some placeholders? That's how you can tweak
 the appearance of the bar (formatting and alignment). The part after the colon
 (``:``) is used to set the ``sprintf`` format of the string.
 
-The ``message`` placeholder is a bit special as you must set the value
-yourself::
-
-    $bar->setMessage('Task starts');
-    $bar->start();
-
-    $bar->setMessage('Task in progress...');
-    $bar->advance();
-
-    // ...
-
-    $bar->setMessage('Task is finished');
-    $bar->finish();
-
 Instead of setting the format for a given instance of a progress bar, you can
 also define global formats::
 
@@ -305,25 +291,41 @@ that displays the number of remaining steps::
 Custom Messages
 ~~~~~~~~~~~~~~~
 
-The ``%message%`` placeholder allows you to specify a custom message to be
-displayed with the progress bar. But if you need more than one, just define
-your own::
+Progress bars define a placeholder called ``message`` to display arbitrary
+messages. However, none of the built-in formats include that placeholder, so
+before displaying these messages, you must define your own custom format::
 
-    $bar->setMessage('Task starts');
-    $bar->setMessage('', 'filename');
-    $bar->start();
+    $progressBar = new ProgressBar($output, 100);
+    $progressBar->setFormatDefinition('custom', ' %current%/%max% -- %message%');
+    $progressBar->setFormat('custom');
 
-    $bar->setMessage('Task is in progress...');
-    while ($file = array_pop($files)) {
-        $bar->setMessage($filename, 'filename');
-        $bar->advance();
-    }
+Now, use the ``setMessage()`` method to set the value of the ``%message%``
+placeholder before displaying the progress bar:
 
-    $bar->setMessage('Task is finished');
-    $bar->setMessage('', 'filename');
-    $bar->finish();
+    // ...
+    $progressBar->setMessage('Start');
+    $progressBar->start();
+    // 0/100 -- Start
+
+    $progressBar->advance();
+    $progressBar->setMessage('Task is in progress...');
+    // 1/100 -- Task is in progress...
+
+Messages can be combined with custom placeholders too. In this example, the
+progress bar uses the ``%message%`` and ``%filename%`` placeholders::
 
-For the ``filename`` to be part of the progress bar, just add the
-``%filename%`` placeholder in your format::
+    $progressBar = new ProgressBar($output, 100);
+    $progressBar->setFormatDefinition('custom', ' %current%/%max% -- %message% (%filename%)');
+    $progressBar->setFormat('custom');
 
-    $bar->setFormat(" %message%\n %current%/%max%\n Working on %filename%");
+The ``setMessage()`` method accepts a second optional argument to set the value
+of the custom placeholders::
+
+    // ...
+    // $files = array('client-001/invoices.xml', '...');
+    foreach ($files as $filename) {
+        $progressBar->setMessage('Importing invoices...');
+        $progressBar->setMessage($filename, 'filename');
+        $progressBar->advance();
+        // 2/100 -- Importing invoices... (client-001/invoices.xml)
+    }

components/console/helpers/questionhelper.rst

@@ -295,7 +295,7 @@ You can also use a validator with a hidden question::
         $question = new Question('Please enter your password');
         $question->setValidator(function ($value) {
             if (trim($value) == '') {
-                throw new \Exception('The password can not be empty');
+                throw new \Exception('The password cannot be empty');
             }
 
             return $value;

components/phpunit_bridge.rst

@@ -345,7 +345,7 @@ namespaces in the ``phpunit.xml`` file, as done for example in the
             <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
                 <arguments>
                     <array>
-                        <element><string>Symfony\Component\HttpFoundation</string></element>
+                        <element key="time-sensitive"><string>Symfony\Component\HttpFoundation</string></element>
                     </array>
                 </arguments>
             </listener>

components/process.rst

@@ -373,7 +373,7 @@ Use :method:`Symfony\\Component\\Process\\Process::disableOutput` and
 
 .. caution::
 
-    You can not enable or disable the output while the process is running.
+    You cannot enable or disable the output while the process is running.
 
     If you disable the output, you cannot access ``getOutput()``,
     ``getIncrementalOutput()``, ``getErrorOutput()``, ``getIncrementalErrorOutput()`` or

components/var_dumper.rst

@@ -88,7 +88,7 @@ of your application may just break it by e.g. sending HTTP headers or
 corrupting your view, the bundle configures the ``dump()`` function so that
 variables are dumped in the web debug toolbar.
 
-But if the toolbar can not be displayed because you e.g. called ``die``/``exit``
+But if the toolbar cannot be displayed because you e.g. called ``die``/``exit``
 or a fatal error occurred, then dumps are written on the regular output.
 
 In a Twig template, two constructs are available for dumping a variable.

controller/soap_web_service.rst

@@ -8,7 +8,7 @@ How to Create a SOAP Web Service in a Symfony Controller
 
 Setting up a controller to act as a SOAP server is simple with a couple
 tools. You must, of course, have the `PHP SOAP`_ extension installed.
-As the PHP SOAP extension can not currently generate a WSDL, you must either
+As the PHP SOAP extension cannot currently generate a WSDL, you must either
 create one from scratch or use a 3rd party generator.
 
 .. note::

deployment/azure-website.rst

@@ -452,7 +452,7 @@ and executed on a Microsoft IIS web server. The process is simple and easy
 to implement. And as a bonus, Microsoft is continuing to reduce the number
 of steps needed so that deployment becomes even easier.
 
-.. _`sign up with Azure`: https://signup.live.com/signup.aspx
+.. _`sign up with Azure`: https://azure.microsoft.com/free/
 .. _`Azure Portal`: https://portal.azure.com
 .. _`PHP MSDN documentation`: http://blogs.msdn.com/b/silverlining/archive/2012/07/10/configuring-php-in-windows-azure-websites-with-user-ini-files.aspx
 .. _`git-scm.com`: http://git-scm.com/download

doctrine/event_listeners_subscribers.rst

@@ -6,7 +6,7 @@
 How to Register Event Listeners and Subscribers
 ===============================================
 
-Doctrine packages a rich event system that fires events when almost anything
+Doctrine packages have a rich event system that fires events when almost anything
 happens inside the system. For you, this means that you can create arbitrary
 :doc:`services </service_container>` and tell Doctrine to notify those
 objects whenever a certain action (e.g. ``prePersist()``) happens within Doctrine.
@@ -207,7 +207,7 @@ interface and have an event method for each event it subscribes to::
 
 .. tip::
 
-    Doctrine event subscribers can not return a flexible array of methods to
+    Doctrine event subscribers cannot return a flexible array of methods to
     call for the events like the :ref:`Symfony event subscriber <event_dispatcher-using-event-subscribers>`
     can. Doctrine event subscribers must return a simple array of the event
     names they subscribe to. Doctrine will then expect methods on the subscriber

frontend/bower.rst

@@ -143,7 +143,7 @@ enough to ensure only bringing in compatible versions.
 
 .. _Bower: http://bower.io
 .. _`Node.js`: https://nodejs.org
-.. _BowerPHP: http://bowerphp.org/
+.. _BowerPHP: https://github.com/Bee-Lab/bowerphp
 .. _`Bower documentation`: http://bower.io/
 .. _Bootstrap: http://getbootstrap.com/
 .. _Gulp: http://gulpjs.com/

reference/forms/types/button.rst

@@ -26,7 +26,7 @@ The following options are defined in the
 :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BaseType` class.
 The ``BaseType`` class is the parent class for both the ``button`` type
 and the :doc:`FormType </reference/forms/types/form>`, but it is not part
-of the form type tree (i.e. it can not be used as a form type on its own).
+of the form type tree (i.e. it cannot be used as a form type on its own).
 
 .. include:: /reference/forms/types/options/button_attr.rst.inc
 

reference/forms/types/form.rst

@@ -131,7 +131,7 @@ The following options are defined in the
 :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\BaseType` class.
 The ``BaseType`` class is the parent class for both the ``form`` type and
 the :doc:`ButtonType </reference/forms/types/button>`, but it is not part
-of the form type tree (i.e. it can not be used as a form type on its own).
+of the form type tree (i.e. it cannot be used as a form type on its own).
 
 .. include:: /reference/forms/types/options/attr.rst.inc
 

routing/redirect_trailing_slash.rst

@@ -42,6 +42,7 @@ system, as explained below:
         // src/AppBundle/Controller/RedirectingController.php
         namespace AppBundle\Controller;
 
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
         use Symfony\Component\HttpFoundation\Request;
 

session/php_bridge.rst

@@ -8,7 +8,7 @@ If you're integrating the Symfony full-stack Framework into a legacy application
 that starts the session with ``session_start()``, you may still be able to
 use Symfony's session management by using the PHP Bridge session.
 
-If the application has it's own PHP save handler, you can specify null
+If the application has its own PHP save handler, you can specify null
 for the ``handler_id``:
 
 .. configuration-block::