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

Commit7f14b3a

Browse files
committed
Merge branch '2.2' into 2.3
2 parents0742bf8 +2c9f14c commit7f14b3a

File tree

6 files changed

+41
-28
lines changed

6 files changed

+41
-28
lines changed

‎book/doctrine.rst‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -960,7 +960,7 @@ To relate the ``Category`` and ``Product`` entities, start by creating a
960960
<entityname="Acme\StoreBundle\Entity\Category">
961961
<!-- ...-->
962962
<one-to-manyfield="products"
963-
target-entity="product"
963+
target-entity="Product"
964964
mapped-by="category"
965965
/>
966966
@@ -988,7 +988,7 @@ makes sense in the application for each ``Category`` to hold an array of
988988
..tip::
989989

990990
The targetEntity value in the decorator used above can reference any entity
991-
with a valid namespace, not just entities defined in the sameclass. To
991+
with a valid namespace, not just entities defined in the samenamespace. To
992992
relate to an entity defined in a different class or bundle, enter a full
993993
namespace as the targetEntity.
994994

@@ -1038,7 +1038,8 @@ object, you'll want to add a ``$category`` property to the ``Product`` class:
10381038
<entityname="Acme\StoreBundle\Entity\Product">
10391039
<!-- ...-->
10401040
<many-to-onefield="category"
1041-
target-entity="products"
1041+
target-entity="Category"
1042+
inversed-by="products"
10421043
join-column="category"
10431044
>
10441045
<join-column
@@ -1205,14 +1206,14 @@ to the given ``Category`` object via their ``category_id`` value.
12051206

12061207
The proxy classes are generated by Doctrine and stored in the cache directory.
12071208
And though you'll probably never even notice that your ``$category``
1208-
object is actually a proxy object, it's important to keep in mind.
1209+
object is actually a proxy object, it's important to keepitin mind.
12091210

12101211
In the next section, when you retrieve the product and category data
12111212
all at once (via a *join*), Doctrine will return the *true* ``Category``
12121213
object, since nothing needs to be lazily loaded.
12131214

1214-
JoiningtoRelated Records
1215-
~~~~~~~~~~~~~~~~~~~~~~~~~~
1215+
Joining Related Records
1216+
~~~~~~~~~~~~~~~~~~~~~~~
12161217

12171218
In the above examples, two queries were made - one for the original object
12181219
(e.g. a ``Category``) and one for the related object(s) (e.g. the ``Product``
@@ -1304,7 +1305,7 @@ callbacks. This is not necessary if you're using YAML or XML for your mapping:
13041305
}
13051306
13061307
Now, you can tell Doctrine to execute a method on any of the available lifecycle
1307-
events. For example, suppose you want to set a ``created`` date column to
1308+
events. For example, suppose you want to set a ``createdAt`` date column to
13081309
the current date, only when the entity is first persisted (i.e. inserted):
13091310

13101311
..configuration-block::
@@ -1314,9 +1315,9 @@ the current date, only when the entity is first persisted (i.e. inserted):
13141315
/**
13151316
* @ORM\PrePersist
13161317
*/
1317-
public functionsetCreatedValue()
1318+
public functionsetCreatedAtValue()
13181319
{
1319-
$this->created = new \DateTime();
1320+
$this->createdAt = new \DateTime();
13201321
}
13211322
13221323
..code-block::yaml
@@ -1326,7 +1327,7 @@ the current date, only when the entity is first persisted (i.e. inserted):
13261327
type:entity
13271328
# ...
13281329
lifecycleCallbacks:
1329-
prePersist:[setCreatedValue]
1330+
prePersist:[setCreatedAtValue]
13301331
13311332
..code-block::xml
13321333
@@ -1339,18 +1340,18 @@ the current date, only when the entity is first persisted (i.e. inserted):
13391340
<!-- ...-->
13401341
<lifecycle-callbacks>
13411342
<lifecycle-callbacktype="prePersist"
1342-
method="setCreatedValue" />
1343+
method="setCreatedAtValue" />
13431344
</lifecycle-callbacks>
13441345
</entity>
13451346
</doctrine-mapping>
13461347
13471348
..note::
13481349

1349-
The above example assumes that you've created and mapped a ``created``
1350+
The above example assumes that you've created and mapped a ``createdAt``
13501351
property (not shown here).
13511352

13521353
Now, right before the entity is first persisted, Doctrine will automatically
1353-
call this method and the ``created`` field will be set to the current date.
1354+
call this method and the ``createdAt`` field will be set to the current date.
13541355

13551356
This can be repeated for any of the other lifecycle events, which include:
13561357

@@ -1368,7 +1369,7 @@ in general, see Doctrine's `Lifecycle Events documentation`_
13681369

13691370
..sidebar::Lifecycle Callbacks and Event Listeners
13701371

1371-
Notice that the ``setCreatedValue()`` method receives no arguments. This
1372+
Notice that the ``setCreatedAtValue()`` method receives no arguments. This
13721373
is always the case for lifecycle callbacks and is intentional: lifecycle
13731374
callbacks should be simple methods that are concerned with internally
13741375
transforming data in the entity (e.g. setting a created/updated field,

‎book/templating.rst‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Creating and using Templates
66

77
As you know, the:doc:`controller</book/controller>` is responsible for
88
handling each request that comes into a Symfony2 application. In reality,
9-
the controller delegatesthemost of the heavy work to other places so that
9+
the controller delegates most of the heavy work to other places so that
1010
code can be tested and reused. When a controller needs to generate HTML,
1111
CSS or any other content, it hands the work off to the templating engine.
1212
In this chapter, you'll learn how to write powerful templates that can be
@@ -204,10 +204,10 @@ First, build a base layout file:
204204
<body>
205205
<div id="sidebar">
206206
{% block sidebar %}
207-
<ul>
208-
<li><a href="/">Home</a></li>
209-
<li><a href="/blog">Blog</a></li>
210-
</ul>
207+
<ul>
208+
<li><a href="/">Home</a></li>
209+
<li><a href="/blog">Blog</a></li>
210+
</ul>
211211
{% endblock %}
212212
</div>
213213

@@ -561,8 +561,10 @@ Including this template from any other template is simple:
561561

562562
The template is included using the ``{{ include() }}`` function. Notice that the
563563
template name follows the same typical convention. The ``articleDetails.html.twig``
564-
template uses an ``article`` variable. This is passed in by the ``list.html.twig``
565-
template using the ``with`` command.
564+
template uses an ``article`` variable, which we pass to it. In this case,
565+
you could avoid doing this entirely, as all of the variables available in
566+
``list.html.twig`` are also available in ``articleDetails.html.twig`` (unless
567+
you set `with_context<twig_include_function>`_ to false).
566568

567569
..tip::
568570

@@ -571,8 +573,9 @@ template using the ``with`` command.
571573
elements, it would look like this: ``{'foo': foo, 'bar': bar}``.
572574

573575
..versionadded::2.2
574-
The ``include()`` function is a new Twig feature that's available in
575-
Symfony 2.2. Prior, the ``{% include %}`` tag was used.
576+
The `include()<twig_include_function>`_ function is a new Twig feature
577+
that's available in Symfony 2.2. Prior, the `{% include %}<twig_include_tag>`_
578+
tag was used.
576579

577580
..index::
578581
single: Templating; Embedding action
@@ -1391,8 +1394,6 @@ in a JavaScript string, use the ``js`` context:
13911394
..index::
13921395
single: Templating; Formats
13931396

1394-
.. _template-formats:
1395-
13961397
Debugging
13971398
---------
13981399

@@ -1434,6 +1435,8 @@ console command:
14341435
# or using the bundle name:
14351436
$ php app/console twig:lint @AcmeArticleBundle
14361437
1438+
.. _template-formats:
1439+
14371440
Template Formats
14381441
----------------
14391442

@@ -1529,3 +1532,5 @@ Learn more from the Cookbook
15291532
.. _`filters`:http://twig.sensiolabs.org/doc/filters/index.html
15301533
.. _`add your own extensions`:http://twig.sensiolabs.org/doc/advanced.html#creating-an-extension
15311534
.. _`hinclude.js`:http://mnot.github.com/hinclude/
1535+
.. _`twig_include_function`:http://twig.sensiolabs.org/doc/functions/include.html
1536+
.. _`twig_include_tag`:http://twig.sensiolabs.org/doc/tags/include.html

‎components/dependency_injection/advanced.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Synthetic services are services that are injected into the container instead
6666
of being created by the container.
6767

6868
For example, if you're using the:doc:`HttpKernel</components/http_kernel/introduction>`
69-
component with the DependencyInjection component, then thethe``request``
69+
component with the DependencyInjection component, then the ``request``
7070
service is injected in the
7171
:method:`ContainerAwareHttpKernel::handle() <Symfony\\Component\\HttpKernel\\DependencyInjection\\ContainerAwareHttpKernel::handle>`
7272
method when entering the request:doc:`scope</cookbook/service_container/scopes>`.

‎components/event_dispatcher/introduction.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ or after a method is executed, without interfering with other plugins. This is
2020
not an easy problem to solve with single inheritance, and multiple inheritance
2121
(were it possible with PHP) has its own drawbacks.
2222

23-
The Symfony2 Event Dispatcher component implements the `Observer`_ pattern in
23+
The Symfony2 Event Dispatcher component implements the `Mediator`_ pattern in
2424
a simple and effective way to make all these things possible and to make your
2525
projects truly extensible.
2626

@@ -588,7 +588,7 @@ part of the listener's processing logic::
588588
}
589589
}
590590

591-
.._Observer:http://en.wikipedia.org/wiki/Observer_pattern
591+
.._Mediator:http://en.wikipedia.org/wiki/Mediator_pattern
592592
.. _Closures:http://php.net/manual/en/functions.anonymous.php
593593
.. _PHP callable:http://www.php.net/manual/en/language.pseudo-types.php#language.types.callback
594594
.. _Packagist:https://packagist.org/packages/symfony/event-dispatcher

‎cookbook/routing/service_container_parameters.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,7 @@ path):
116116
Just like in normal service container configuration files, if you actually
117117
need a ``%`` in your route, you can escape the percent sign by doubling
118118
it, e.g. ``/score-50%%``, which would resolve to ``/score-50%``.
119+
120+
However, as the ``%`` characters included in any URL are automatically encoded,
121+
the resulting URL of this example would be ``/score-50%25`` (``%25`` is the
122+
result of encoding the ``%`` character).

‎reference/forms/types/birthday.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ option defaults to 120 years ago to the current year.
2424
+----------------------+-------------------------------------------------------------------------------+
2525
| Inherited Options| - `widget`_|
2626
|| - `input`_|
27+
|| - `empty_value`_|
2728
|| - `months`_|
2829
|| - `days`_|
2930
|| - `format`_|
@@ -61,6 +62,8 @@ These options inherit from the :doc:`date</reference/forms/types/date>` type:
6162

6263
..include::/reference/forms/types/options/date_input.rst.inc
6364

65+
..include::/reference/forms/types/options/empty_value.rst.inc
66+
6467
..include::/reference/forms/types/options/months.rst.inc
6568

6669
..include::/reference/forms/types/options/days.rst.inc

0 commit comments

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