Merge branch '2.3' into 2.6

wouterj · wouterj · commit ae8474dcba0f · 2015-06-20T00:59:57.000+02:00
Conflicts:
	components/options_resolver.rst
diff --git a/components/class_loader/introduction.rst b/components/class_loader/introduction.rst
@@ -41,5 +41,7 @@ You can install the component in 2 different ways:
   on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/ClassLoader).
 
+.. include:: /components/require_autoload.rst.inc
+
 .. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
 .. _Packagist: https://packagist.org/packages/symfony/class-loader
diff --git a/components/config/introduction.rst b/components/config/introduction.rst
@@ -17,6 +17,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/config`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Config).
 
+.. include:: /components/require_autoload.rst.inc
+
 Sections
 --------
 
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Console).
 
+.. include:: /components/require_autoload.rst.inc
+
 Creating a basic Command
 ------------------------
 
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -15,6 +15,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/CssSelector).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/debug/introduction.rst b/components/debug/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in many different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/debug`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Debug).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/DependencyInjection).
 
+.. include:: /components/require_autoload.rst.inc
+
 Basic Usage
 -----------
 
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/DomCrawler).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -56,6 +56,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/EventDispatcher).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/filesystem/introduction.rst b/components/filesystem/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Filesystem).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/finder.rst b/components/finder.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/finder`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Finder).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
@@ -302,7 +304,7 @@ The contents of returned files can be read with
 
     foreach ($finder as $file) {
         $contents = $file->getContents();
-        
+
         // ...
     }
 
diff --git a/components/form/introduction.rst b/components/form/introduction.rst
@@ -22,6 +22,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Form).
 
+.. include:: /components/require_autoload.rst.inc
+
 Configuration
 -------------
 
diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst
@@ -24,6 +24,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/HttpFoundation).
 
+.. include:: /components/require_autoload.rst.inc
+
 .. _component-http-foundation-request:
 
 Request
diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/http-kernel`` on Packagist_);
 * Use the official Git repository (https://github.com/symfony/HttpKernel).
 
+.. include:: /components/require_autoload.rst.inc
+
 The Workflow of a Request
 -------------------------
 
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
@@ -17,6 +17,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/options-resolver`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/OptionsResolver).
 
+.. include:: /components/require_autoload.rst.inc
+
 Notes on Previous Versions
 --------------------------
 
diff --git a/components/process.rst b/components/process.rst
@@ -15,6 +15,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/process`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Process).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in two different ways:
 * :doc:`Install it via Composer</components/using_components>` (``symfony/property-access`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/PropertyAccess).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/require_autoload.rst.inc b/components/require_autoload.rst.inc
@@ -0,0 +1,3 @@
+Then, require the ``vendor/autoload.php`` file to enable the autoloading mechanism
+provided by Composer. Otherwise, your application won't be able to find the classes
+of this Symfony component.
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/routing`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Routing).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/security/introduction.rst b/components/security/introduction.rst
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/security`` on Packagist_);
 * Use the official Git repository (https://github.com/symfony/Security).
 
+.. include:: /components/require_autoload.rst.inc
+
 Sections
 --------
 
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -33,6 +33,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Serializer).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/stopwatch.rst b/components/stopwatch.rst
@@ -15,6 +15,8 @@ You can install the component in two different ways:
 * :doc:`Install it via Composer</components/using_components>` (``symfony/stopwatch`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Stopwatch).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/templating/introduction.rst b/components/templating/introduction.rst
@@ -21,6 +21,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/templating`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Templating).
 
+.. include:: /components/require_autoload.rst.inc
+
 Usage
 -----
 
diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
@@ -16,6 +16,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/translation`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Translation).
 
+.. include:: /components/require_autoload.rst.inc
+
 Constructing the Translator
 ---------------------------
 
diff --git a/components/yaml/introduction.rst b/components/yaml/introduction.rst
@@ -34,6 +34,8 @@ You can install the component in 2 different ways:
 * :doc:`Install it via Composer </components/using_components>` (``symfony/yaml`` on `Packagist`_);
 * Use the official Git repository (https://github.com/symfony/Yaml).
 
+.. include:: /components/require_autoload.rst.inc
+
 Why?
 ----
 
diff --git a/cookbook/console/command_in_controller.rst b/cookbook/console/command_in_controller.rst
@@ -30,7 +30,7 @@ Run this command from inside your controller via::
     use Symfony\Bundle\FrameworkBundle\Console\Application;
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\Console\Input\ArrayInput;
-    use Symfony\Component\Console\Output\BufferedOutput;
+    use Symfony\Component\Console\Output\StreamOutput;
     use Symfony\Component\HttpFoundation\Response;
 
     class SpoolController extends Controller
@@ -46,12 +46,14 @@ Run this command from inside your controller via::
                '--message-limit' => $messages,
             ));
             // You can use NullOutput() if you don't need the output
-            $output = new BufferedOutput();
+            $output = new StreamOutput(tmpfile(), StreamOutput::VERBOSITY_NORMAL);
             $application->run($input, $output);
 
             // return the output, don't use if you used NullOutput()
-            $content = $output->fetch();
-            
+            rewind($output->getStream());
+            $content = stream_get_contents($output->getStream());
+            fclose($output->getStream());
+
             // return new Response(""), if you used NullOutput()
             return new Response($content);
         }
@@ -60,7 +62,7 @@ Run this command from inside your controller via::
 Showing Colorized Command Output
 --------------------------------
 
-By telling the ``BufferedOutput`` it is decorated via the second parameter,
+By telling the ``StreamOutput`` it is decorated via the third parameter,
 it will return the Ansi color-coded content. The `SensioLabs AnsiToHtml converter`_
 can be used to convert this to colorful HTML.
 
@@ -76,8 +78,8 @@ Now, use it in your controller::
     namespace AppBundle\Controller;
 
     use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
-    use Symfony\Component\Console\Output\BufferedOutput;
     use Symfony\Component\Console\Output\OutputInterface;
+    use Symfony\Component\Console\Output\StreamOutput;
     use Symfony\Component\HttpFoundation\Response;
     // ...
 
@@ -86,15 +88,14 @@ Now, use it in your controller::
         public function sendSpoolAction($messages = 10)
         {
             // ...
-            $output = new BufferedOutput(
-                OutputInterface::VERBOSITY_NORMAL,
-                true // true for decorated
-            );
+            $output = new StreamOutput(tmpfile(), StreamOutput::VERBOSITY_NORMAL, true);
             // ...
 
             // return the output
             $converter = new AnsiToHtmlConverter();
-            $content = $output->fetch();
+            rewind($output->getStream());
+            $content = stream_get_contents($output->getStream());
+            fclose($output->getStream());
 
             return new Response($converter->convert($content));
         }
diff --git a/cookbook/controller/index.rst b/cookbook/controller/index.rst
@@ -6,3 +6,4 @@ Controller
 
     error_pages
     service
+    upload_file
diff --git a/cookbook/controller/upload_file.rst b/cookbook/controller/upload_file.rst
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
