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

Commita45fee8

Browse files
committed
Merge branch '2.3' into 2.4
Conflicts:cookbook/security/voters.rstcookbook/service_container/scopes.rst
2 parents6d34aa6 +d084d87 commita45fee8

File tree

71 files changed

+437
-227
lines changed

Some content is hidden

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

71 files changed

+437
-227
lines changed

‎book/forms.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ Submitting Forms with Multiple Buttons
281281

282282
When your form contains more than one submit button, you will want to check
283283
which of the buttons was clicked to adapt the program flow in your controller.
284-
Let'sadd a second button with the caption "Save and add" toour form::
284+
To do this,add a second button with the caption "Save and add" toyour form::
285285

286286
$form = $this->createFormBuilder($task)
287287
->add('task', 'text')
@@ -552,8 +552,8 @@ Groups based on the Clicked Button
552552
When your form contains multiple submit buttons, you can change the validation
553553
group depending on which button is used to submit the form. For example,
554554
consider a form in a wizard that lets you advance to the next step or go back
555-
to the previous step.Let's assumealsothat when returning to the previous
556-
step,the data of the form should be saved, but not validated.
555+
to the previous step.Also assume that when returning to the previous step,
556+
the data of the form should be saved, but not validated.
557557

558558
First, we need to add the two buttons to the form::
559559

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ to maintain. There are several problems that need to be addressed:
7575
tied to MySQL. Though not covered here, Symfony2 fully integrates `Doctrine`_,
7676
a library dedicated to database abstraction and mapping.
7777

78-
Let's get to work on solving these problems and more.
79-
8078
Isolating the Presentation
8179
~~~~~~~~~~~~~~~~~~~~~~~~~~
8280

@@ -676,8 +674,8 @@ Where Symfony2 Delivers
676674
~~~~~~~~~~~~~~~~~~~~~~~
677675

678676
In the upcoming chapters, you'll learn more about how each piece of Symfony
679-
works and the recommended organization of a project. For now,let's see how
680-
migrating the blog from flat PHP to Symfony2 has improved life:
677+
works and the recommended organization of a project. For now,have a look
678+
at howmigrating the blog from flat PHP to Symfony2 has improved life:
681679

682680
* Your application now has **clear and consistently organized code** (though
683681
Symfony doesn't force you into this). This promotes **reusability** and

‎book/propel.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ configuration file (``config.yml``):
5555
5656
propel:
5757
dbal:
58-
driver:"%database_driver%"
59-
user:"%database_user%"
60-
password:"%database_password%"
61-
dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
58+
driver:"%database_driver%"
59+
user:"%database_user%"
60+
password:"%database_password%"
61+
dsn:"%database_driver%:host=%database_host%;dbname=%database_name%;charset=%database_charset%"
6262
6363
Now that Propel knows about your database, Symfony2 can create the database for
6464
you:

‎book/routing.rst‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,13 @@ match, giving the ``page`` parameter a value of ``2``. Perfect.
432432
| /blog/2| blog| {page} = 2|
433433
+--------------------+-------+-----------------------+
434434

435+
..caution::
436+
437+
Of course, you can have more than one optional placeholder (e.g. ``/blog/{slug}/{page}``),
438+
but everything after an optional placeholder must be optional. For example,
439+
``/{page}/blog`` is a valid path, but ``page`` will always be required
440+
(i.e. simply ``/blog`` will not match this route).
441+
435442
..tip::
436443

437444
Routes with optional parameters at the end will not match on requests

‎book/security.rst‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ authentication (i.e. the old-school username/password box):
4545
security:
4646
firewalls:
4747
secured_area:
48-
pattern:^/
48+
pattern:^/
4949
anonymous:~
5050
http_basic:
5151
realm:"Secured Demo Area"
@@ -148,8 +148,8 @@ that looks like the following:
148148
* All URLs *not* matching ``/admin/*`` are accessible by all users (and the
149149
user is never prompted to log in).
150150

151-
Let's look briefly athow security works and how each part of the configuration
152-
comes into play.
151+
Read this short summary abouthow security works and how each part of the
152+
configurationcomes into play.
153153

154154
How Security Works: Authentication and Authorization
155155
----------------------------------------------------
@@ -300,11 +300,11 @@ First, enable form login under your firewall:
300300
security:
301301
firewalls:
302302
secured_area:
303-
pattern:^/
303+
pattern:^/
304304
anonymous:~
305305
form_login:
306-
login_path:login
307-
check_path:login_check
306+
login_path:login
307+
check_path:login_check
308308
309309
..code-block::xml
310310
@@ -373,10 +373,10 @@ submission (i.e. ``/login_check``):
373373
374374
# app/config/routing.yml
375375
login:
376-
path:/login
377-
defaults:{ _controller: AcmeSecurityBundle:Security:login }
376+
path:/login
377+
defaults:{ _controller: AcmeSecurityBundle:Security:login }
378378
login_check:
379-
path:/login_check
379+
path:/login_check
380380
381381
..code-block::xml
382382
@@ -537,7 +537,7 @@ And that's it! When you submit the form, the security system will automatically
537537
check the user's credentials and either authenticate the user or send the
538538
user back to the login form where the error can be displayed.
539539

540-
Let's review the whole process:
540+
To review the whole process:
541541

542542
#. The user tries to access a resource that is protected;
543543
#. The firewall initiates the authentication process by redirecting the
@@ -633,8 +633,8 @@ see :doc:`/cookbook/security/form_login`.
633633
634634
firewalls:
635635
login_firewall:
636-
pattern:^/login$
637-
anonymous:~
636+
pattern:^/login$
637+
anonymous:~
638638
secured_area:
639639
pattern:^/
640640
form_login:~
@@ -1211,13 +1211,14 @@ aren't stored anywhere in a database. The actual user object is provided
12111211
by Symfony (:class:`Symfony\\Component\\Security\\Core\\User\\User`).
12121212

12131213
..tip::
1214+
12141215
Any user provider can load users directly from configuration by specifying
12151216
the ``users`` configuration parameter and listing the users beneath it.
12161217

12171218
..caution::
12181219

12191220
If your username is completely numeric (e.g. ``77``) or contains a dash
1220-
(e.g. ``user-name``), you should usethat alternative syntax when specifying
1221+
(e.g. ``user-name``), you should usean alternative syntax when specifying
12211222
users in YAML:
12221223

12231224
..code-block::yaml

‎book/translation.rst‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ by the routing system using the special ``_locale`` parameter:
449449
..code-block::yaml
450450
451451
contact:
452-
path:/{_locale}/contact
453-
defaults:{ _controller: AcmeDemoBundle:Contact:index, _locale: en }
452+
path:/{_locale}/contact
453+
defaults:{ _controller: AcmeDemoBundle:Contact:index }
454454
requirements:
455455
_locale:en|fr|de
456456
@@ -464,7 +464,6 @@ by the routing system using the special ``_locale`` parameter:
464464
465465
<routeid="contact"path="/{_locale}/contact">
466466
<defaultkey="_controller">AcmeDemoBundle:Contact:index</default>
467-
<defaultkey="_locale">en</default>
468467
<requirementkey="_locale">en|fr|de</requirement>
469468
</route>
470469
</routes>
@@ -475,12 +474,15 @@ by the routing system using the special ``_locale`` parameter:
475474
use Symfony\Component\Routing\Route;
476475
477476
$collection = new RouteCollection();
478-
$collection->add('contact', new Route('/{_locale}/contact', array(
479-
'_controller' => 'AcmeDemoBundle:Contact:index',
480-
'_locale' => 'en',
481-
), array(
482-
'_locale' => 'en|fr|de',
483-
)));
477+
$collection->add('contact', new Route(
478+
'/{_locale}/contact',
479+
array(
480+
'_controller' => 'AcmeDemoBundle:Contact:index',
481+
),
482+
array(
483+
'_locale' => 'en|fr|de',
484+
)
485+
));
484486
485487
return $collection;
486488

‎components/config/definition.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ applied to it (like: "the value for ``auto_connect`` must be a boolean value"):
2121
default_connection:mysql
2222
connections:
2323
mysql:
24-
host:localhost
25-
driver:mysql
24+
host:localhost
25+
driver:mysql
2626
username:user
2727
password:pass
2828
sqlite:
29-
host:localhost
30-
driver:sqlite
31-
memory:true
29+
host:localhost
30+
driver:sqlite
31+
memory:true
3232
username:user
3333
password:pass
3434
@@ -470,9 +470,9 @@ in this config:
470470
..code-block::yaml
471471
472472
connection:
473-
name:my_mysql_connection
474-
host:localhost
475-
driver:mysql
473+
name:my_mysql_connection
474+
host:localhost
475+
driver:mysql
476476
username:user
477477
password:pass
478478

‎components/console/introduction.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can install the component in 2 different ways:
2727
configured with an ANSI driver and your console commands invoke other scripts which
2828
emit ANSI color sequences, they will be shown as raw escape characters.
2929

30-
To enable ANSIcolour support for Windows, please install `ANSICON`_.
30+
To enable ANSIcolor support for Windows, please install `ANSICON`_.
3131

3232
Creating a basic Command
3333
------------------------
@@ -529,4 +529,4 @@ Learn More!
529529
*:doc:`/components/console/events`
530530

531531
.. _Packagist:https://packagist.org/packages/symfony/console
532-
.. _ANSICON:https://github.com/adoxa/ansicon/downloads
532+
.. _ANSICON:https://github.com/adoxa/ansicon/releases

‎components/dependency_injection/parameters.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ making the class of a service a parameter:
134134
135135
services:
136136
mailer:
137-
class:'%mailer.class%'
138-
arguments:['%mailer.transport%']
137+
class:"%mailer.class%"
138+
arguments:["%mailer.transport%"]
139139
140140
..code-block::xml
141141

‎components/dependency_injection/parentservices.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The service config for these classes would look something like this:
6262
my_email_formatter:
6363
# ...
6464
newsletter_manager:
65-
class:"%newsletter_manager.class%"
65+
class:"%newsletter_manager.class%"
6666
calls:
6767
-[setMailer, ["@my_mailer"]]
6868
-[setEmailFormatter, ["@my_email_formatter"]]
@@ -196,7 +196,7 @@ a parent for a service.
196196
-[setEmailFormatter, ["@my_email_formatter"]]
197197
198198
newsletter_manager:
199-
class:"%newsletter_manager.class%"
199+
class:"%newsletter_manager.class%"
200200
parent:mail_manager
201201
202202
greeting_card_manager:
@@ -321,13 +321,13 @@ to the ``NewsletterManager`` class, the config would look like this:
321321
-[setEmailFormatter, ["@my_email_formatter"]]
322322
323323
newsletter_manager:
324-
class:"%newsletter_manager.class%"
324+
class:"%newsletter_manager.class%"
325325
parent:mail_manager
326326
calls:
327327
-[setMailer, ["@my_alternative_mailer"]]
328328
329329
greeting_card_manager:
330-
class:"%greeting_card_manager.class%"
330+
class:"%greeting_card_manager.class%"
331331
parent:mail_manager
332332
333333
..code-block::xml

0 commit comments

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