10000 Merge branch '2.8' · symfony/symfony-docs@c2b92e1 · GitHub
[go: up one dir, main page]
Skip to content

Commit c2b92e1

Browse files
wouterjwouterj
committed
Merge branch '2.8'
2 parents 12d8531 + 075a4b5 commit c2b92e1

13 files changed

+25
-17
lines changed

‎best_practices/security.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ more advanced use-case, you can always do the same security check in PHP:
221221

222222
.. code-block:: php
223223
224+
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
225+
226+
// ...
227+
224228
/**
225229
* @Route("/{id}/edit", name="admin_post_edit")
226230
*/
@@ -234,7 +238,7 @@ more advanced use-case, you can always do the same security check in PHP:
234238
}
235239
236240
if (!$post->isAuthor($this->getUser())) {
237-
throw $this->createAccessDeniedException();
241+
throw new AccessDeniedException();
238242
}
239243
240244
// ...
@@ -323,6 +327,10 @@ via the even easier shortcut in a controller:
323327

324328
.. code-block:: php
325329
330+
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
331+
332+
// ...
333+
326334
/**
327335
* @Route("/{id}/edit", name="admin_post_edit")
328336
*/

‎book/from_flat_php_to_symfony2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ Learn more from the Cookbook
754754
* :doc:`/cookbook/controller/service`
755755

756756
.. _`Doctrine`: http://www.doctrine-project.org
757-
.. _`download Composer`: http://getcomposer.org/download/
757+
.. _`download Composer`: https://getcomposer.org/download/
758758
.. _`Routing`: https://github.com/symfony/Routing
759759
.. _`Templating`: https://github.com/symfony/Templating
760760
.. _`KnpBundles.com`: http://knpbundles.com/

‎book/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ a wide variety of articles about solving specific problems with Symfony.
391391
at this cookbook article: ":doc:`/cookbook/bundles/remove`"
392392

393393
.. _`explained in this post`: http://fabien.potencier.org/article/73/signing-project-releases
394-
.. _`Composer`: http://getcomposer.org/
394+
.. _`Composer`: https://getcomposer.org/
395395
.. _`Composer download page`: https://getcomposer.org/download/
396396
.. _`Apache`: http://httpd.apache.org/docs/current/mod/core.html#documentroot
397397
.. _`Nginx`: http://wiki.nginx.org/Symfony

‎components/class_loader/cache_class_loader.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ it is straightforward::
6464
$loader->unregister();
6565

6666
.. _APC: http://php.net/manual/en/book.apc.php
67-
.. _autoloader: http://getcomposer.org/doc/01-basic-usage.md#autoloading
67+
.. _autoloader: https://getcomposer.org/doc/01-basic-usage.md#autoloading
6868
.. _XCache: http://xcache.lighttpd.net

‎components/class_loader/class_map_generator.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,4 @@ the same as in the example above)::
122122

123123
.. _`PSR-0`: http://www.php-fig.org/psr/psr-0
124124
.. _`PSR-4`: http://www.php-fig.org/psr/psr-4
125-
.. _`Composer`: http://getcomposer.org
125+
.. _`Composer`: https://getcomposer.org

‎components/using_components.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,5 @@ documentation to find out more about how to use it.
7777

7878
And have fun!
7979

80-
.. _Composer: http://getcomposer.org
81-
.. _Install composer: http://getcomposer.org/download/
80+
.. _Composer: https://getcomposer.org
81+
.. _Install composer: https://getcomposer.org/download/

‎contributing/code/tests.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ browser.
9595
dependencies installed.
9696

9797
.. _install PHPUnit: https://phpunit.de/manual/current/en/installation.html
98-
.. _`Composer`: http://getcomposer.org/
98+
.. _`Composer`: https://getcomposer.org/

‎cookbook/bundles/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Other Setup
111111
At this point, check the ``README`` file of your brand new bundle to see
112112
what to do next. Have fun!
113113

114-
.. _their documentation: http://getcomposer.org/doc/00-intro.md
114+
.. _their documentation: https://getcomposer.org/doc/00-intro.md
115115
.. _Packagist.org: https://packagist.org
116116
.. _FOSUserBundle: https://github.com/FriendsOfSymfony/FOSUserBundle
117117
.. _KnpBundles.com: http://knpbundles.com/

‎cookbook/composer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To install Composer on Linux or Mac OS X, execute the following two commands:
2424
.. note::
2525

2626
If you don't have ``curl`` installed, you can also just download the
27-
``installer`` file manually at http://getcomposer.org/installer and
27+
``installer`` file manually at https://getcomposer.org/installer and
2828
then run:
2929

3030
.. code-block:: bash

‎cookbook/symfony1.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,6 @@ In reality, the Symfony2 configuration is much more powerful and is used
364364
primarily to configure objects that you can use. For more information, see
365365
the chapter titled ":doc:`/book/service_container`".
366366

367-
.. _`Composer`: http://getcomposer.org
367+
.. _`Composer`: https://getcomposer.org
368368
.. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
369-
.. _`the Composer documentation`: http://getcomposer.org/doc/04-schema.md#autoload
369+
.. _`the Composer documentation`: https://getcomposer.org/doc/04-schema.md#autoload

‎cookbook/workflow/_vendor_deps.rst.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ script to ensure that all of the needed vendor libraries are downloaded.
5656
to replace only the original parts (i.e. be sure not to also delete any of
5757
your custom entries).
5858

59-
.. _Composer: http://getcomposer.org/
60-
.. _GetComposer.org: http://getcomposer.org/
59+
.. _Composer: https://getcomposer.org/
60+
.. _GetComposer.org: https://getcomposer.org/

‎quick_tour/the_architecture.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,4 @@ need to learn a lot to become a Symfony master. Ready to dig into these
309309
topics now? Look no further - go to the official :doc:`/book/index` and
310310
pick any topic you want.
311311

312-
.. _Composer: http://getcomposer.org
312+
.. _Composer: https://getcomposer.org

‎quick_tour/the_big_picture.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ this name is not needed, but later it'll be useful for linking pages.
221221

222222
Considering all this, the ``@Route("/app/example", name="homepage")`` annotation
223223
creates a new route called ``homepage`` which makes Symfony execute the
224-
``index`` action of the ``Default`` controller when the user browses the
224+
``index`` action of the ``Default`` controller when the user browses the
225225
``/app/example`` path of the application.
226226

227227
.. tip::
@@ -349,5 +349,5 @@ If you are eager to learn more about Symfony, dive into the next section:
349349
":doc:`The View <the_view>`".
350350

351351
.. _Composer: https://getcomposer.org/
352-
.. _executable installer: http://getcomposer.org/download
352+
.. _executable installer: https://getcomposer.org/download
353353
.. _Twig: http://twig.sensiolabs.org/

0 commit comments

Comments
 (0)
0