Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit907ee0d

Browse files
committed
Merge branch '2.7'
* 2.7: (31 commits) fix merge after removing @Security in 2.3 Reverting a commit on 2.5 branch, as it was only meant to be on 2.3 (so reverting after the merge) [#4735] Reverting what was left on the 2.5 branch after the merge conflict had already put back some of it Typo Fix: "allows to" should be "allows you to" Adding a link to log things in the prod environment [#4857] Adding missing word thanks to xabbuh move cautions to make them visible Fixing bad english thanks to xabbuh Adding missing words thanks to javiereguiluz language tweak thanks to xabbuh! Adding an example image of the debug_formatter [#4643] Minor english changes to make things even smoother (though they were correct before) replace API link for SwiftmailerBundle Update security.rst Update routing.rst don't output message from AuthenticationException Add custom link labels where Cookbook articles titles looked wrong Fix typo: BLOG => BLOB Fix code example Removed a leftover comma in security config sample ...
2 parentsa17bdd7 +7363c9b commit907ee0d

File tree

126 files changed

+678
-922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+678
-922
lines changed

‎best_practices/configuration.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ add an extra layer of configuration that's not needed because you don't need
7474
or want these configuration values to change on each server.
7575

7676
The configuration options defined in the ``config.yml`` file usually vary from
77-
one:doc:`/cookbook/configuration/environments` to another. That's why Symfony
78-
already includes ``app/config/config_dev.yml`` and ``app/config/config_prod.yml``
77+
one:doc:`environment</cookbook/configuration/environments>` to another. That's
78+
why Symfonyalready includes ``app/config/config_dev.yml`` and ``app/config/config_prod.yml``
7979
files so that you can override specific values for each environment.
8080

8181
Constants vs Configuration Options

‎best_practices/controllers.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ For example:
139139
140140
use AppBundle\Entity\Post;
141141
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
142-
142+
143143
/**
144144
* @Route("/{id}", name="admin_post_show")
145145
*/
@@ -212,6 +212,7 @@ Pre and Post Hooks
212212
------------------
213213

214214
If you need to execute some code before or after the execution of your controllers,
215-
you can use the EventDispatcher component to:doc:`/cookbook/event_dispatcher/before_after_filters`.
215+
you can use the EventDispatcher component to
216+
:doc:`set up before and after filters</cookbook/event_dispatcher/before_after_filters>`.
216217

217218
.. _`ParamConverter`:http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html

‎best_practices/forms.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ fields:
165165

166166
If you need more control over how your fields are rendered, then you should
167167
remove the ``form_widget(form)`` function and render your fields individually.
168-
See:doc:`/cookbook/form/form_customization` for more information on this and how
169-
you can control *how* the form renders at a global level using form theming.
168+
See the:doc:`/cookbook/form/form_customization` article for more information
169+
on this and how you can control *how* the form renders at a global level
170+
using form theming.
170171

171172
Handling Form Submits
172173
---------------------

‎best_practices/security.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ Now you can reuse this method both in the template and in the security expressio
208208
{% endif %}
209209

210210
.. _best-practices-directly-isGranted:
211+
.. _checking-permissions-without-security:
212+
.. _manually-checking-permissions:
211213

212214
Checking Permissions without @Security
213215
--------------------------------------

‎book/controller.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,6 @@ content that's sent back to the client::
683683
$response = new Response(json_encode(array('name' => $name)));
684684
$response->headers->set('Content-Type', 'application/json');
685685

686-
..versionadded::2.4
687-
Support for HTTP status code constants was introduced in Symfony 2.4.
688-
689686
The ``headers`` property is a:class:`Symfony\\Component\\HttpFoundation\\HeaderBag`
690687
object and has some nice methods for getting and setting the headers. The
691688
header names are normalized so that using ``Content-Type`` is equivalent to

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,6 @@ the HTTP response being returned. Use them to improve the blog:
484484
// echo the headers and send the response
485485
$response->send();
486486

487-
..versionadded::2.4
488-
Support for HTTP status code constants was introduced in Symfony 2.4.
489-
490487
The controllers are now responsible for returning a ``Response`` object.
491488
To make this easier, you can add a new ``render_template()`` function, which,
492489
incidentally, acts quite a bit like the Symfony templating engine:

‎book/http_fundamentals.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,6 @@ interface to construct the response that needs to be returned to the client::
287287
// prints the HTTP headers followed by the content
288288
$response->send();
289289

290-
..versionadded::2.4
291-
Support for HTTP status code constants was introduced in Symfony 2.4.
292-
293290
If Symfony offered nothing else, you would already have a toolkit for easily
294291
accessing request information and an object-oriented interface for creating
295292
the response. Even as you learn the many powerful features in Symfony, keep

‎book/internals.rst‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,6 @@ processing must only occur on the master request).
208208
Events
209209
~~~~~~
210210

211-
..versionadded::2.4
212-
The ``isMasterRequest()`` method was introduced in Symfony 2.4.
213-
Prior, the ``getRequestType()`` method must be used.
214-
215211
Each event thrown by the Kernel is a subclass of
216212
:class:`Symfony\\Component\\HttpKernel\\Event\\KernelEvent`. This means that
217213
each event has access to the same basic information:

‎book/routing.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ be added for each parameter. For example:
644644

645645
..configuration-block::
646646

647-
..code-block::php
647+
..code-block::php-annotations
648648
649649
// src/AppBundle/Controller/BlogController.php
650650
@@ -915,9 +915,6 @@ component documentation.
915915
Completely Customized Route Matching with Conditions
916916
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
917917

918-
..versionadded::2.4
919-
Route conditions were introduced in Symfony 2.4.
920-
921918
As you've seen, a route can be made to match only certain routing wildcards
922919
(via regular expressions), HTTP methods, or host names. But the routing system
923920
can be extended to have an almost infinite flexibility using ``conditions``:

‎book/security.rst‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Security
55
========
66

77
Symfony's security system is incredibly powerful, but it can also be confusing
8-
tosetup. In this chapter, you'll learn how tosetup your application's security
8+
toset up. In this chapter, you'll learn how toset up your application's security
99
step-by-step, from configuring your firewall and how you load users to denying
1010
access and fetching the User object. Depending on what you need, sometimes
1111
the initial setup can be tough. But once it's done, Symfony's security system
@@ -300,7 +300,7 @@ provider, but it's better to think of it as an "in configuration" provider:
300300
memory:
301301
users:
302302
ryan:
303-
password:ryanpass,
303+
password:ryanpass
304304
roles:'ROLE_USER'
305305
admin:
306306
password:kitten
@@ -808,9 +808,6 @@ You can easily deny access from inside a controller::
808808
The ``security.authorization_checker`` service was introduced in Symfony 2.6. Prior
809809
to Symfony 2.6, you had to use the ``isGranted()`` method of the ``security.context`` service.
810810

811-
..versionadded::2.5
812-
The ``createAccessDeniedException`` method was introduced in Symfony 2.5.
813-
814811
The:method:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller::createAccessDeniedException`
815812
method creates a special:class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
816813
object, which ultimately triggers a 403 HTTP response inside Symfony.
@@ -925,9 +922,6 @@ special attributes like this:
925922

926923
.. _book-security-template-expression:
927924

928-
..versionadded::2.4
929-
The ``expression`` functionality was introduced in Symfony 2.4.
930-
931925
You can also use expressions inside your templates:
932926

933927
..configuration-block::
@@ -1304,11 +1298,6 @@ cookie will be ever created by Symfony):
13041298
Checking for Known Security Vulnerabilities in Dependencies
13051299
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13061300

1307-
..versionadded::2.5
1308-
The ``security:check`` command was introduced in Symfony 2.5. This command is
1309-
included in ``SensioDistributionBundle``, which has to be registered in your
1310-
application in order to use this command.
1311-
13121301
When using lots of dependencies in your Symfony projects, some of them may
13131302
contain security vulnerabilities. That's why Symfony includes a command called
13141303
``security:check`` that checks your ``composer.lock`` file to find any known

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp