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

Commit7a0b1de

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: Fix typo: than in Twig => than Twig templates use a global Composer installation Completed the needed context to successfully test commands add validation config reference section Some more fixes after proofreading Fixes incorrect latin abbrev Some general grammar and style fixes in the book
2 parentsce2ed77 +bd65c3c commit7a0b1de

29 files changed

+182
-115
lines changed

‎best_practices/templates.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ languages - like `Twig`_ - were created to make templating even better.
99

1010
Use Twig templating format for your templates.
1111

12-
Generally speaking, PHP templates are much more verbose thaninTwig because
12+
Generally speaking, PHP templates are much more verbose than Twig templates because
1313
they lack native support for lots of modern features needed by templates,
1414
like inheritance, automatic escaping and named arguments for filters and
1515
functions.

‎book/doctrine.rst‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ for you:
119119
..sidebar::Setting up the Database to be UTF8
120120

121121
One mistake even seasoned developers make when starting a Symfony project
122-
is forgetting tosetup default charset and collation on their database,
122+
is forgetting toset up default charset and collation on their database,
123123
ending up with latin type collations, which are default for most databases.
124124
They might even remember to do it the very first time, but forget that
125125
it's all gone after running a relatively common command during development:
@@ -339,7 +339,7 @@ see the :ref:`book-doctrine-field-types` section.
339339

340340
You can also check out Doctrine's `Basic Mapping Documentation`_ for
341341
all details about mapping information. If you use annotations, you'll
342-
need to prepend all annotations with ``ORM\`` (e.g. ``ORM\Column(..)``),
342+
need to prepend all annotations with ``ORM\`` (e.g. ``ORM\Column(...)``),
343343
which is not shown in Doctrine's documentation. You'll also need to include
344344
the ``use Doctrine\ORM\Mapping as ORM;`` statement, which *imports* the
345345
``ORM`` annotations prefix.
@@ -357,7 +357,7 @@ see the :ref:`book-doctrine-field-types` section.
357357

358358
..note::
359359

360-
When using another library or program (ie. Doxygen) that uses annotations,
360+
When using another library or program (e.g. Doxygen) that uses annotations,
361361
you should place the ``@IgnoreAnnotation`` annotation on the class to
362362
indicate which annotations Symfony should ignore.
363363

@@ -385,7 +385,7 @@ a regular PHP class, you need to create getter and setter methods (e.g. ``getNam
385385
386386
$ php app/console doctrine:generate:entities AppBundle/Entity/Product
387387
388-
This command makes sure that allofthe getters and setters are generated
388+
This command makes sure that all the getters and setters are generated
389389
for the ``Product`` class. This is a safe command - you can run it over and
390390
over again: it only generates getters and setters that don't exist (i.e. it
391391
doesn't replace your existing methods).
@@ -432,7 +432,7 @@ mapping information) of a bundle or an entire namespace:
432432
..note::
433433

434434
Doctrine doesn't care whether your properties are ``protected`` or ``private``,
435-
or whetheror notyou have a getter or setter function for a property.
435+
or whether you have a getter or setter function for a property.
436436
The getters and setters are generated here only because you'll need them
437437
to interact with your PHP object.
438438

@@ -770,7 +770,7 @@ already did in the previous section).
770770

771771
The DQL syntax is incredibly powerful, allowing you to easily join between
772772
entities (the topic of:ref:`relations<book-doctrine-relations>` will be
773-
covered later), group, etc. For more information, see the official Doctrine
773+
covered later), group, etc. For more information, see the official
774774
`Doctrine Query Language`_ documentation.
775775

776776
Custom Repository Classes
@@ -833,7 +833,7 @@ used earlier to generate the missing getter and setter methods:
833833
$ php app/console doctrine:generate:entities AppBundle
834834
835835
Next, add a new method - ``findAllOrderedByName()`` - to the newly generated
836-
repository class. This method will query for allofthe ``Product`` entities,
836+
repository class. This method will query for all the ``Product`` entities,
837837
ordered alphabetically.
838838

839839
..code-block::php
@@ -1352,7 +1352,7 @@ Doctrine's `Lifecycle Events documentation`_.
13521352
transforming data in the entity (e.g. setting a created/updated field,
13531353
generating a slug value).
13541354

1355-
If you need to do some heavier lifting - likeperform logging orsend
1355+
If you need to do some heavier lifting - likeperforming logging orsending
13561356
an email - you should register an external class as an event listener
13571357
or subscriber and give it access to whatever resources you need. For
13581358
more information, see:doc:`/cookbook/doctrine/event_listeners_subscribers`.
@@ -1362,7 +1362,7 @@ Doctrine's `Lifecycle Events documentation`_.
13621362
Doctrine Field Types Reference
13631363
------------------------------
13641364

1365-
Doctrine comes witha large number of field types available. Each of these
1365+
Doctrine comes withnumerous field types available. Each of these
13661366
maps a PHP data type to a specific column type in whatever database you're
13671367
using. For each field type, the ``Column`` can be configured further, setting
13681368
the ``length``, ``nullable`` behavior, ``name`` and other options. To see a

‎book/forms.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ That's it! Just three lines are needed to render the complete form:
172172
when using file uploads.
173173

174174
``form_widget(form)``
175-
Renders allofthe fields, which includes the field element itself, a label
175+
Renders all the fields, which includes the field element itself, a label
176176
and any validation error messages for the field.
177177

178178
``form_end()``

‎book/from_flat_php_to_symfony2.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ is primarily an HTML file that uses a template-like PHP syntax:
126126
</body>
127127
</html>
128128

129-
By convention, the file that contains allofthe application logic - ``index.php`` -
129+
By convention, the file that contains all the application logic - ``index.php`` -
130130
is known as a "controller". The term:term:`controller` is a word you'll hear
131131
a lot, regardless of the language or framework you use. It refers simply
132132
to the area of *your* code that processes user input and prepares the response.
@@ -244,8 +244,8 @@ the layout:
244244

245245
<?php include 'layout.php' ?>
246246

247-
You've nowintroduced amethodology thatallows for thereuseofthe
248-
layout.Unfortunately, to accomplish this, you're forced to use a few ugly
247+
You nowhave asetup thatwill allow you toreuse the layout.
248+
Unfortunately, to accomplish this, you're forced to use a few ugly
249249
PHP functions (``ob_start()``, ``ob_get_clean()``) in the template. Symfony
250250
uses a Templating component that allows this to be accomplished cleanly
251251
and easily. You'll see it in action shortly.
@@ -447,7 +447,7 @@ into a vendor/ directory:
447447

448448
..code-block::bash
449449
450-
$phpcomposer.phar install
450+
$ composer install
451451
452452
Beside downloading your dependencies, Composer generates a ``vendor/autoload.php`` file,
453453
which takes care of autoloading for all the files in the Symfony Framework as well as

‎book/http_cache.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ Here is a list of the main options:
236236
(default: ``60``). This setting is overridden by the ``stale-if-error`` HTTP
237237
``Cache-Control`` extension (see RFC 5861).
238238

239-
If ``debug`` is ``true``, Symfony automatically addsa ``X-Symfony-Cache``
239+
If ``debug`` is ``true``, Symfony automatically addsan ``X-Symfony-Cache``
240240
header to the response containing useful information about cache hits and
241241
misses.
242242

@@ -427,7 +427,7 @@ on a cache to store and return "fresh" responses.
427427
model of the specification dominates your work. Unfortunately, the actual
428428
specification document - `RFC 2616`_ - can be difficult to read.
429429

430-
There is anon-going effort (`HTTP Bis`_) to rewrite the RFC 2616. It does
430+
There is anongoing effort (`HTTP Bis`_) to rewrite the RFC 2616. It does
431431
not describe a new version of HTTP, but mostly clarifies the original HTTP
432432
specification. The organization is also improved as the specification
433433
is split into seven parts; everything related to HTTP caching can be
@@ -482,7 +482,7 @@ The resulting HTTP header will look like this:
482482
timezone as required by the specification.
483483

484484
Note that in HTTP versions before 1.1 the origin server wasn't required to
485-
send the ``Date`` header. Consequently the cache (e.g. the browser) might
485+
send the ``Date`` header. Consequently, the cache (e.g. the browser) might
486486
need to rely on the local clock to evaluate the ``Expires`` header making
487487
the lifetime calculation vulnerable to clock skew. Another limitation
488488
of the ``Expires`` header is that the specification states that "HTTP/1.1
@@ -528,9 +528,9 @@ won't be asked to return the updated response until the cache finally becomes
528528
stale.
529529

530530
The validation model addresses this issue. Under this model, the cache continues
531-
to store responses. The difference is that, for each request, the cache asks
532-
theapplicationwhether or notthe cached response is still valid. If the
533-
cache *is* still valid, your application should return a 304 status code
531+
to store responses. The difference is that, for each request, the cache asks the
532+
applicationifthe cached response is still valid or if it needs to be regenerated.
533+
If thecache *is* still valid, your application should return a 304 status code
534534
and no content. This tells the cache that it's ok to return the cached response.
535535

536536
Under this model, you only save CPU if you're able to determine that the

‎book/http_fundamentals.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ how you develop on the web, the goal of your server is *always* to understand
3838
simple text requests, and return simple text responses.
3939

4040
Symfony is built from the ground up around that reality. Whether you realize
41-
it or not, HTTP is something you useeveryday. With Symfony, you'll learn
41+
it or not, HTTP is something you useevery day. With Symfony, you'll learn
4242
how to master it.
4343

4444
..index::
@@ -545,7 +545,7 @@ regardless of how your project is developed. To name a few:
545545
:doc:`Translation</components/translation/introduction>`
546546
A framework for translating strings in your application.
547547

548-
Eachand everyone of these components is decoupled and can be used in *any*
548+
Each one of these components is decoupled and can be used in *any*
549549
PHP project, regardless of whether or not you use the Symfony framework.
550550
Every part is made to be used if needed and replaced when necessary.
551551

‎book/installation.rst‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,7 @@ don't have installed it globally, start by reading the next section.
117117
Installing Composer Globally
118118
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
119119

120-
On Linux and Mac OS X, execute the following two commands to install Composer
121-
globally:
122-
123-
..code-block::bash
124-
125-
$ curl -sS https://getcomposer.org/installer| php
126-
$ sudo mv composer.phar /usr/local/bin/composer
127-
128-
On Windows Systems, download the executable Composer installer that you can find
129-
on the `Composer download page`_ and follow the steps.
120+
Start with:doc:`installing Composer globally</cookbook/composer>`.
130121

131122
Creating a Symfony Application with Composer
132123
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -279,7 +270,7 @@ If there are any issues, correct them now before moving on.
279270
Updating Symfony Applications
280271
-----------------------------
281272

282-
At this point, you'vecreate a fully-functional Symfony application in which
273+
At this point, you'vecreated a fully-functional Symfony application in which
283274
you'll start to develop your own project. A Symfony application depends on
284275
a number of external libraries. These are downloaded into the ``vendor/`` directory
285276
and they are managed exclusively by Composer.
@@ -326,10 +317,10 @@ If you're using a version control system like `Git`_, you can safely commit all
326317
your project's code. The reason is that Symfony applications already contain a
327318
``.gitignore`` file specially prepared for Symfony.
328319

329-
For specific instructions on how best tosetup your project to be stored
320+
For specific instructions on how best toset up your project to be stored
330321
in Git, see:doc:`/cookbook/workflow/new_project_git`.
331322

332-
Checking out aVersioned Symfony Application
323+
Checking out aversioned Symfony Application
333324
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
334325

335326
When using Composer to manage application's dependencies, it's recommended to

‎book/page_creation.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Before you begin: Create the Bundle
9393
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9494

9595
Before you begin, you'll need to create a *bundle*. In Symfony, a:term:`bundle`
96-
is like a plugin, except that allofthe code in your application will live
96+
is like a plugin, except that all the code in your application will live
9797
inside a bundle.
9898

9999
A bundle is nothing more than a directory that houses everything related
@@ -108,7 +108,7 @@ create the route.
108108

109109
To create a bundle called ``AcmeDemoBundle`` (a play bundle that you'll
110110
build in this chapter), run the following command and follow the on-screen
111-
instructions (use allofthe default options):
111+
instructions (use all the default options):
112112

113113
..code-block::bash
114114
@@ -327,7 +327,7 @@ An optional, but common, third step in the process is to create a template.
327327
Optional Step 3: Create the Template
328328
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
329329

330-
Templates allow you to move allofthe presentation (e.g. HTML code) into
330+
Templates allow you to move all the presentationcode(e.g. HTML) into
331331
a separate file and reuse different portions of the page layout. Instead
332332
of writing the HTML inside the controller, render a template instead:
333333

@@ -607,7 +607,7 @@ You'll learn more about each of these directories in later chapters.
607607
The Source (``src``) Directory
608608
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
609609

610-
Put simply, the ``src/`` directory contains allofthe actual code (PHP code,
610+
Put simply, the ``src/`` directory contains all the actual code (PHP code,
611611
templates, configuration files, stylesheets, etc) that drives *your* application.
612612
When developing, the vast majority of your work will be done inside one or
613613
more bundles that you create in this directory.
@@ -788,7 +788,7 @@ bundle.
788788
Application Configuration
789789
-------------------------
790790

791-
An application consists of a collection of bundles representing allofthe
791+
An application consists of a collection of bundles representing all the
792792
features and capabilities of your application. Each bundle can be customized
793793
via configuration files written in YAML, XML or PHP. By default, the main
794794
configuration file lives in the ``app/config/`` directory and is called

‎book/performance.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ command line, and might become part of your deploy process:
6060

6161
..code-block::bash
6262
63-
$phpcomposer.phar dump-autoload --optimize
63+
$ composer dump-autoload --optimize
6464
6565
Internally, this builds the big class map array in ``vendor/composer/autoload_classmap.php``.
6666

@@ -128,8 +128,7 @@ Note that there are two disadvantages when using a bootstrap file:
128128
* when debugging, one will need to place break points inside the bootstrap file.
129129

130130
If you're using the Symfony Standard Edition, the bootstrap file is automatically
131-
rebuilt after updating the vendor libraries via the ``php composer.phar install``
132-
command.
131+
rebuilt after updating the vendor libraries via the ``composer install`` command.
133132

134133
Bootstrap Files and Byte Code Caches
135134
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎book/security.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Firewalls (Authentication)
171171

172172
When a user makes a request to a URL that's protected by a firewall, the
173173
security system is activated. The job of the firewall is to determine whether
174-
or notthe user needs to be authenticated, and if they do, to send a response
174+
the user needs to be authenticated, and if they do, to send a response
175175
back to the user initiating the authentication process.
176176

177177
A firewall is activated when the URL of an incoming request matches the configured
@@ -710,7 +710,7 @@ see :doc:`/cookbook/security/form_login`.
710710
Next, make sure that your ``check_path`` URL (e.g. ``/login_check``)
711711
is behind the firewall you're using for your form login (in this example,
712712
the single firewall matches *all* URLs, including ``/login_check``). If
713-
``/login_check`` doesn't match any firewall, you'll receivea ``Unable
713+
``/login_check`` doesn't match any firewall, you'll receivean ``Unable
714714
to find the controller for path "/login_check"`` exception.
715715

716716
**4. Multiple firewalls don't share security context**
@@ -827,7 +827,7 @@ things:
827827
...................
828828

829829
Symfony creates an instance of:class:`Symfony\\Component\\HttpFoundation\\RequestMatcher`
830-
for each ``access_control`` entry, which determines whetheror nota given
830+
for each ``access_control`` entry, which determines whether a given
831831
access control should be used on this request. The following ``access_control``
832832
options are used for matching:
833833

@@ -1587,7 +1587,7 @@ key in ``app/config/security.yml``.
15871587

15881588
When you allow a user to submit a plaintext password (e.g. registration
15891589
form, change password form), you *must* have validation that guarantees
1590-
that the password is 4096 characters orless. Read more details in
1590+
that the password is 4096 characters orfewer. Read more details in
15911591
:ref:`How to implement a simple Registration Form<cookbook-registration-password-max>`.
15921592

15931593
Retrieving the User Object
@@ -1788,7 +1788,7 @@ Roles
17881788

17891789
The idea of a "role" is key to the authorization process. Each user is assigned
17901790
a set of roles and then each resource requires one or more roles. If the user
1791-
has any one of the required roles, access is granted. Otherwise access is denied.
1791+
has any one of the required roles, access is granted. Otherwise, access is denied.
17921792

17931793
Roles are pretty simple, and are basically strings that you can invent and
17941794
use as needed (though roles are objects internally). For example, if you
@@ -2286,7 +2286,7 @@ Security can be a deep and complex issue to solve correctly in your application.
22862286
Fortunately, Symfony's Security component follows a well-proven security
22872287
model based around *authentication* and *authorization*. Authentication,
22882288
which always happens first, is handled by a firewall whose job is to determine
2289-
the identity of the user through severaldifferentmethods (e.g. HTTP authentication,
2289+
the identity of the user through several methods (e.g. HTTP authentication,
22902290
login form, etc). In the cookbook, you'll find examples of other methods
22912291
for handling authentication, including how to implement a "remember me" cookie
22922292
functionality.

0 commit comments

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