Merge branch '2.3' into 2.6

Conflicts:
	best_practices/security.rst

Author: wouterj

best_practices/security.rst

@@ -221,6 +221,10 @@ more advanced use-case, you can always do the same security check in PHP:
 
 .. code-block:: php
 
+    use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+
+    // ...
+
     /**
      * @Route("/{id}/edit", name="admin_post_edit")
      */
@@ -234,7 +238,7 @@ more advanced use-case, you can always do the same security check in PHP:
         }
 
         if (!$post->isAuthor($this->getUser())) {
-            throw $this->createAccessDeniedException();
+            throw new AccessDeniedException();
         }
 
         // ...
@@ -323,6 +327,10 @@ via the even easier shortcut in a controller:
 
 .. code-block:: php
 
+    use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+
+    // ...
+
     /**
      * @Route("/{id}/edit", name="admin_post_edit")
      */

book/from_flat_php_to_symfony2.rst

@@ -754,7 +754,7 @@ Learn more from the Cookbook
 * :doc:`/cookbook/controller/service`
 
 .. _`Doctrine`: http://www.doctrine-project.org
-.. _`download Composer`: http://getcomposer.org/download/
+.. _`download Composer`: https://getcomposer.org/download/
 .. _`Routing`: https://github.com/symfony/Routing
 .. _`Templating`: https://github.com/symfony/Templating
 .. _`KnpBundles.com`: http://knpbundles.com/

book/installation.rst

@@ -391,7 +391,7 @@ a wide variety of articles about solving specific problems with Symfony.
     at this cookbook article: ":doc:`/cookbook/bundles/remove`"
 
 .. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
-.. _`Composer`: http://getcomposer.org/
+.. _`Composer`: https://getcomposer.org/
 .. _`Composer download page`: https://getcomposer.org/download/
 .. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot
 .. _`Nginx`: http://wiki.nginx.org/Symfony

components/class_loader/cache_class_loader.rst

@@ -64,5 +64,5 @@ it is straightforward::
     $loader->unregister();
 
 .. _APC:        http://php.net/manual/en/book.apc.php
-.. _autoloader: http://getcomposer.org/doc/01-basic-usage.md#autoloading
+.. _autoloader: https://getcomposer.org/doc/01-basic-usage.md#autoloading
 .. _XCache:     http://xcache.lighttpd.net

components/class_loader/class_map_generator.rst

@@ -122,4 +122,4 @@ the same as in the example above)::
 
 .. _`PSR-0`: http://www.php-fig.org/psr/psr-0
 .. _`PSR-4`: http://www.php-fig.org/psr/psr-4
-.. _`Composer`: http://getcomposer.org
+.. _`Composer`: https://getcomposer.org

components/using_components.rst

@@ -77,5 +77,5 @@ documentation to find out more about how to use it.
 
 And have fun!
 
-.. _Composer: http://getcomposer.org
-.. _Install composer: http://getcomposer.org/download/
+.. _Composer: https://getcomposer.org
+.. _Install composer: https://getcomposer.org/download/

contributing/code/tests.rst

@@ -95,4 +95,4 @@ browser.
     dependencies installed.
 
 .. _install PHPUnit: https://phpunit.de/manual/current/en/installation.html
-.. _`Composer`: http://getcomposer.org/
+.. _`Composer`: https://getcomposer.org/

cookbook/bundles/installation.rst

@@ -111,7 +111,7 @@ Other Setup
 At this point, check the ``README`` file of your brand new bundle to see
 what to do next. Have fun!
 
-.. _their documentation: http://getcomposer.org/doc/00-intro.md
+.. _their documentation: https://getcomposer.org/doc/00-intro.md
 .. _Packagist.org:       https://packagist.org
 .. _FOSUserBundle:       https://github.com/FriendsOfSymfony/FOSUserBundle
 .. _KnpBundles.com:      http://knpbundles.com/

cookbook/composer.rst

@@ -24,7 +24,7 @@ To install Composer on Linux or Mac OS X, execute the following two commands:
 .. note::
 
     If you don't have ``curl`` installed, you can also just download the
-    ``installer`` file manually at http://getcomposer.org/installer and
+    ``installer`` file manually at https://getcomposer.org/installer and
     then run:
 
     .. code-block:: bash

cookbook/symfony1.rst

@@ -364,6 +364,6 @@ In reality, the Symfony2 configuration is much more powerful and is used
 primarily to configure objects that you can use. For more information, see
 the chapter titled ":doc:`/book/service_container`".
 
-.. _`Composer`: http://getcomposer.org
+.. _`Composer`: https://getcomposer.org
 .. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
-.. _`the Composer documentation`: http://getcomposer.org/doc/04-schema.md#autoload
+.. _`the Composer documentation`: https://getcomposer.org/doc/04-schema.md#autoload