Merge branch '2.5' into 2.6

Conflicts:
	components/http_foundation/introduction.rst

Author: wouterj

book/installation.rst

@@ -135,7 +135,7 @@ version as the second argument of the ``create-project`` command:
 
 .. code-block:: bash
 
-    $ composer create-project symfony/framework-standard-edition my_project_name '2.3.*'
+    $ composer create-project symfony/framework-standard-edition my_project_name "2.3.*"
 
 .. tip::
 

components/event_dispatcher/traceable_dispatcher.rst

@@ -34,7 +34,11 @@ to register event listeners and dispatch events::
     // register an event listener
     $eventListener = ...;
     $priority = ...;
-    $traceableEventDispatcher->addListener('event.the_name', $eventListener, $priority);
+    $traceableEventDispatcher->addListener(
+        'event.the_name',
+        $eventListener,
+        $priority
+    );
 
     // dispatch an event
     $event = ...;

components/finder.rst

@@ -302,7 +302,8 @@ The contents of returned files can be read with
 
     foreach ($finder as $file) {
         $contents = $file->getContents();
-        ...
+        
+        // ...
     }
 
 .. _strtotime:    http://www.php.net/manual/en/datetime.formats.php

components/form/form_events.rst

@@ -134,7 +134,7 @@ The ``FormEvents::PRE_SUBMIT`` event is dispatched at the beginning of the
 
 It can be used to:
 
-* Change data from the request, before submitting the data to the form.
+* Change data from the request, before submitting the data to the form;
 * Add or remove form fields, before submitting the data to the form.
 
 :ref:`Form Events Information Table<component-form-event-table>`
@@ -309,7 +309,10 @@ callback for better readability::
         {
             $builder->add('username', 'text');
             $builder->add('show_email', 'checkbox');
-            $builder->addEventListener(FormEvents::PRE_SET_DATA, array($this, 'onPreSetData'));
+            $builder->addEventListener(
+                FormEvents::PRE_SET_DATA,
+                array($this, 'onPreSetData')
+            );
         }
 
         public function onPreSetData(FormEvent $event)

components/form/introduction.rst

@@ -186,17 +186,17 @@ to bootstrap or access Twig and add the :class:`Symfony\\Bridge\\Twig\\Extension
     // this file comes with TwigBridge
     $defaultFormTheme = 'form_div_layout.html.twig';
 
-    $vendorDir = realpath(__DIR__ . '/../vendor');
+    $vendorDir = realpath(__DIR__.'/../vendor');
     // the path to TwigBridge so Twig can locate the
     // form_div_layout.html.twig file
     $vendorTwigBridgeDir =
-        $vendorDir . '/symfony/twig-bridge/Symfony/Bridge/Twig';
+        $vendorDir.'/symfony/twig-bridge/Symfony/Bridge/Twig';
     // the path to your other templates
-    $viewsDir = realpath(__DIR__ . '/../views');
+    $viewsDir = realpath(__DIR__.'/../views');
 
     $twig = new Twig_Environment(new Twig_Loader_Filesystem(array(
         $viewsDir,
-        $vendorTwigBridgeDir . '/Resources/views/Form',
+        $vendorTwigBridgeDir.'/Resources/views/Form',
     )));
     $formEngine = new TwigRendererEngine(array($defaultFormTheme));
     $formEngine->setEnvironment($twig);
@@ -315,24 +315,24 @@ Your integration with the Validation component will look something like this::
     use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
     use Symfony\Component\Validator\Validation;
 
-    $vendorDir = realpath(__DIR__ . '/../vendor');
-    $vendorFormDir = $vendorDir . '/symfony/form/Symfony/Component/Form';
+    $vendorDir = realpath(__DIR__.'/../vendor');
+    $vendorFormDir = $vendorDir.'/symfony/form/Symfony/Component/Form';
     $vendorValidatorDir =
-        $vendorDir . '/symfony/validator/Symfony/Component/Validator';
+        $vendorDir.'/symfony/validator/Symfony/Component/Validator';
 
     // create the validator - details will vary
     $validator = Validation::createValidator();
 
     // there are built-in translations for the core error messages
     $translator->addResource(
         'xlf',
-        $vendorFormDir . '/Resources/translations/validators.en.xlf',
+        $vendorFormDir.'/Resources/translations/validators.en.xlf',
         'en',
         'validators'
     );
     $translator->addResource(
         'xlf',
-        $vendorValidatorDir . '/Resources/translations/validators.en.xlf',
+        $vendorValidatorDir.'/Resources/translations/validators.en.xlf',
         'en',
         'validators'
     );
@@ -679,10 +679,12 @@ method to access the list of errors. It returns a
 
     // ...
 
-    // a FormErrorIterator instance, but only errors attached to this form level (e.g. "global errors)
+    // a FormErrorIterator instance, but only errors attached to this
+    // form level (e.g. "global errors)
     $errors = $form->getErrors();
 
-    // a FormErrorIterator instance, but only errors attached to the "firstName" field
+    // a FormErrorIterator instance, but only errors attached to the
+    // "firstName" field
     $errors = $form['firstName']->getErrors();
 
     // a FormErrorIterator instance in a flattened structure

components/form/type_guesser.rst

@@ -46,7 +46,7 @@ Start by creating the class and these methods. Next, you'll learn how to fill ea
 
     use Symfony\Component\Form\FormTypeGuesserInterface;
 
-    class PhpdocTypeGuesser implements FormTypeGuesserInterface
+    class PHPDocTypeGuesser implements FormTypeGuesserInterface
     {
         public function guessType($class, $property)
         {
@@ -92,7 +92,7 @@ With this knowledge, you can easily implement the ``guessType`` method of the
     use Symfony\Component\Form\Guess\Guess;
     use Symfony\Component\Form\Guess\TypeGuess;
 
-    class PhpdocTypeGuesser implements FormTypeGuesserInterface
+    class PHPDocTypeGuesser implements FormTypeGuesserInterface
     {
         public function guessType($class, $property)
         {

components/http_foundation/introduction.rst

@@ -250,8 +250,8 @@ by using the following methods:
 :method:`Symfony\\Component\\HttpFoundation\\Request::getCharsets`
     Returns the list of accepted charsets ordered by descending quality.
 
-* :method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings`:
-  returns the list of accepted charsets ordered by descending quality;
+:method:`Symfony\\Component\\HttpFoundation\\Request::getEncodings`
+    Returns the list of accepted encodings ordered by descending quality.
 
   .. versionadded:: 2.4
       The ``getEncodings()`` method was introduced in Symfony 2.4.
@@ -331,7 +331,7 @@ code, and an array of HTTP headers::
         array('content-type' => 'text/html')
     );
 
-These information can also be manipulated after the Response object creation::
+This information can also be manipulated after the Response object creation::
 
     $response->setContent('Hello World');
 

components/http_foundation/sessions.rst

@@ -190,8 +190,12 @@ data is an array, for example a set of tokens. In this case, managing the array
 becomes a burden because you have to retrieve the array then process it and
 store it again::
 
-    $tokens = array('tokens' => array('a' => 'a6c1e0b6',
-                                      'b' => 'f4a7b1f3'));
+    $tokens = array(
+        'tokens' => array(
+            'a' => 'a6c1e0b6',
+            'b' => 'f4a7b1f3',
+        ),
+    );
 
 So any processing of this might quickly get ugly, even simply adding a token to
 the array::
@@ -201,7 +205,7 @@ the array::
     $session->set('tokens', $tokens);
 
 With structured namespacing, the key can be translated to the array
-structure like this using a namespace character (defaults to `/`)::
+structure like this using a namespace character (defaults to ``/``)::
 
     $session->set('tokens/c', $value);
 

components/intl.rst

@@ -22,8 +22,8 @@ Installation
 
 You can install the component in two different ways:
 
-* Using the official Git repository (https://github.com/symfony/Intl);
-* :doc:`Install it via Composer</components/using_components>` (``symfony/intl`` on `Packagist`_).
+* :doc:`Install it via Composer</components/using_components>` (``symfony/intl`` on `Packagist`_);
+* Using the official Git repository (https://github.com/symfony/Intl).
 
 If you install the component via Composer, the following classes and functions
 of the intl extension will be automatically provided if the intl extension is

components/process.rst

@@ -136,7 +136,7 @@ Stopping a Process
 
 Any asynchronous process can be stopped at any time with the
 :method:`Symfony\\Component\\Process\\Process::stop` method. This method takes
-two arguments : a timeout and a signal. Once the timeout is reached, the signal
+two arguments: a timeout and a signal. Once the timeout is reached, the signal
 is sent to the running process. The default signal sent to a process is ``SIGKILL``.
 Please read the :ref:`signal documentation below<reference-process-signal>`
 to find out more about signal handling in the Process component::
@@ -252,7 +252,7 @@ Process Signals
 .. versionadded:: 2.3
     The ``signal`` method was introduced in Symfony 2.3.
 
-When running a program asynchronously, you can send it posix signals with the
+When running a program asynchronously, you can send it POSIX signals with the
 :method:`Symfony\\Component\\Process\\Process::signal` method::
 
     use Symfony\Component\Process\Process;