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

Commit55a015e

Browse files
committed
Merge branch '2.8' into 3.0
Conflicts:cookbook/service_container/scopes.rst
2 parentse19f7a1 +2aeffdf commit55a015e

File tree

36 files changed

+268
-80
lines changed

36 files changed

+268
-80
lines changed

‎best_practices/i18n.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ following ``translator`` configuration option and set your application locale:
1111
# app/config/config.yml
1212
framework:
1313
# ...
14-
translator:{ fallbacks: ["%locale%"] }
14+
translator:{ fallbacks: ['%locale%'] }
1515
1616
# app/config/parameters.yml
1717
parameters:

‎best_practices/templates.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ name is irrelevant because you never use it in your own code):
156156
services:
157157
app.twig.app_extension:
158158
class:AppBundle\Twig\AppExtension
159-
arguments:["@markdown"]
159+
arguments:['@markdown']
160160
public:false
161161
tags:
162162
-{ name: twig.extension }

‎book/service_container.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ straightforward. Parameters make defining services more organized and flexible:
175175
services:
176176
my_mailer:
177177
class:Acme\HelloBundle\Mailer
178-
arguments:["%my_mailer.transport%"]
178+
arguments:['%my_mailer.transport%']
179179
180180
..code-block::xml
181181
@@ -311,7 +311,7 @@ directories don't exist, create them.
311311
services:
312312
my_mailer:
313313
class:Acme\HelloBundle\Mailer
314-
arguments:["%my_mailer.transport%"]
314+
arguments:['%my_mailer.transport%']
315315
316316
..code-block::xml
317317
@@ -572,7 +572,7 @@ the service container gives you a much more appealing option:
572572
573573
newsletter_manager:
574574
class:Acme\HelloBundle\Newsletter\NewsletterManager
575-
arguments:["@my_mailer"]
575+
arguments:['@my_mailer']
576576
577577
..code-block::xml
578578
@@ -766,7 +766,7 @@ Injecting the dependency by the setter method just needs a change of syntax:
766766
newsletter_manager:
767767
class:Acme\HelloBundle\Newsletter\NewsletterManager
768768
calls:
769-
-[setMailer, ["@my_mailer"]]
769+
-[setMailer, ['@my_mailer']]
770770
771771
..code-block::xml
772772
@@ -909,7 +909,7 @@ it exists and do nothing if it doesn't:
909909
services:
910910
newsletter_manager:
911911
class:Acme\HelloBundle\Newsletter\NewsletterManager
912-
arguments:["@?my_mailer"]
912+
arguments:['@?my_mailer']
913913
914914
..code-block::xml
915915
@@ -1019,7 +1019,7 @@ Configuring the service container is easy:
10191019
services:
10201020
newsletter_manager:
10211021
class:Acme\HelloBundle\Newsletter\NewsletterManager
1022-
arguments:["@mailer", "@templating"]
1022+
arguments:['@mailer', '@templating']
10231023
10241024
..code-block::xml
10251025

‎book/translation.rst

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ The translator service is accessible in PHP templates through the
334334
Translation Resource/File Names and Locations
335335
---------------------------------------------
336336

337-
Symfony looks for message files (i.e. translations) in the following locations:
337+
Symfony looks for message files (i.e. translations) in the followingdefaultlocations:
338338

339339
* the ``app/Resources/translations`` directory;
340340

@@ -372,6 +372,51 @@ The choice of which loader to use is entirely up to you and is a matter of
372372
taste. The recommended option is to use ``xlf`` for translations.
373373
For more options, see:ref:`component-translator-message-catalogs`.
374374

375+
..note::
376+
377+
You can add other directories with the ``paths`` option in the configuration:
378+
379+
..configuration-block::
380+
381+
..code-block::yaml
382+
383+
# app/config/config.yml
384+
framework:
385+
translator:
386+
paths:
387+
-'%kernel.root_dir%/../translations'
388+
389+
..code-block::xml
390+
391+
<!-- app/config/config.xml-->
392+
<?xml version="1.0" encoding="UTF-8" ?>
393+
<containerxmlns="http://symfony.com/schema/dic/services"
394+
xmlns:framework="http://symfony.com/schema/dic/symfony"
395+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-Instance"
396+
xsi:schemaLocation="http://symfony.com/schema/dic/services
397+
http://symfony.com/schema/dic/services/services-1.0.xsd
398+
http://symfony.com/schema/dic/symfony
399+
http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"
400+
>
401+
402+
<framework:config>
403+
<framework:translator>
404+
<framework:path>%kernel.root_dir%/../translations</framework:path>
405+
</framework:translator>
406+
</framework:config>
407+
</container>
408+
409+
..code-block::php
410+
411+
// app/config/config.php
412+
$container->loadFromExtension('framework', array(
413+
'translator' => array(
414+
'paths' => array(
415+
'%kernel.root_dir%/../translations',
416+
),
417+
),
418+
));
419+
375420
..note::
376421

377422
You can also store translations in a database, or any other storage by

‎changelog.rst

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,149 @@ documentation.
1313
Do you also want to participate in the Symfony Documentation? Take a look
1414
at the ":doc:`/contributing/documentation/overview`" article.
1515

16+
November, 2015
17+
--------------
18+
19+
New Documentation
20+
~~~~~~~~~~~~~~~~~
21+
22+
* `#5907<https://github.com/symfony/symfony-docs/pull/5907>`_ Updating some places to use the new CustomUserMessageAuthenticationException (weaverryan)
23+
* `#5922<https://github.com/symfony/symfony-docs/pull/5922>`_ Added minimal cookbook article about the shared flag (WouterJ)
24+
* `#5908<https://github.com/symfony/symfony-docs/pull/5908>`_ Voter update (weaverryan)
25+
* `#5909<https://github.com/symfony/symfony-docs/pull/5909>`_ More 2.8 form updates (weaverryan)
26+
* `#5927<https://github.com/symfony/symfony-docs/pull/5927>`_ Use path() and url() PHP templating helpers (WouterJ)
27+
* `#5926<https://github.com/symfony/symfony-docs/pull/5926>`_ Update voter section of best practices (WouterJ)
28+
* `#5921<https://github.com/symfony/symfony-docs/pull/5921>`_ [2.8] Document some Security changes (WouterJ)
29+
* `#5834<https://github.com/symfony/symfony-docs/pull/5834>`_ Updated form aliases to FQCNs for forms in book and component (hiddewie)
30+
* `#5265<https://github.com/symfony/symfony-docs/pull/5265>`_ Documentation for the new Guard authentication style (weaverryan)
31+
* `#5899<https://github.com/symfony/symfony-docs/pull/5899>`_ Adding the MicroKernel article (weaverryan)
32+
* `#5893<https://github.com/symfony/symfony-docs/pull/5893>`_ Added a note about the use of _format query parameter (javiereguiluz)
33+
* `#5891<https://github.com/symfony/symfony-docs/pull/5891>`_ Removed the comments about the is_granted() issues in non-secure pages (javiereguiluz)
34+
* `#5876<https://github.com/symfony/symfony-docs/pull/5876>`_ Symfony 2.7 Form choice option update (aivus, althaus, weaverryan)
35+
* `#5861<https://github.com/symfony/symfony-docs/pull/5861>`_ Updated Table Console helper for spanning cols and rows (hiddewie)
36+
* `#5835<https://github.com/symfony/symfony-docs/pull/5835>`_ Updated CssSelector code example to use the new Converter (hiddewie)
37+
* `#5816<https://github.com/symfony/symfony-docs/pull/5816>`_ Merge branches (nicolas-grekas, snoek09, WouterJ, xabbuh)
38+
* `#5804<https://github.com/symfony/symfony-docs/pull/5804>`_ Added documentation for dnsMessage option (BenjaminPaap)
39+
* `#5774<https://github.com/symfony/symfony-docs/pull/5774>`_ Show a more real example in data collectors doc (WouterJ)
40+
* `#5735<https://github.com/symfony/symfony-docs/pull/5735>`_ [Contributing][Code] do not distinguish regular classes and API classes (xabbuh)
41+
42+
Fixed Documentation
43+
~~~~~~~~~~~~~~~~~~~
44+
45+
* `#5903<https://github.com/symfony/symfony-docs/pull/5903>`_ Update front controller (nurolopher)
46+
* `#5768<https://github.com/symfony/symfony-docs/pull/5768>`_ Removed "http_basic" config from the login form cookbook (javiereguiluz)
47+
* `#5863<https://github.com/symfony/symfony-docs/pull/5863>`_ Correct useAttributeAsKey usage (danrot)
48+
* `#5833<https://github.com/symfony/symfony-docs/pull/5833>`_ Fixed whitelist delivery of swiftmailer (hiddewie)
49+
* `#5815<https://github.com/symfony/symfony-docs/pull/5815>`_ fix constraint names (xabbuh)
50+
* `#5793<https://github.com/symfony/symfony-docs/pull/5793>`_ Callback Validation Constraint: Remove reference to deprecated option (ceithir)
51+
52+
Minor Documentation Changes
53+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
54+
55+
* `#5931<https://github.com/symfony/symfony-docs/pull/5931>`_ [#5875] Fixed link description, list of common media types (Douglas Naphas)
56+
* `#5923<https://github.com/symfony/symfony-docs/pull/5923>`_ Remove information about request service deps of core services (WouterJ)
57+
* `#5911<https://github.com/symfony/symfony-docs/pull/5911>`_ Wrap all strings containing @ in quotes in Yaml (WouterJ)
58+
* `#5889<https://github.com/symfony/symfony-docs/pull/5889>`_ Always use "main" as the default firewall name (to match Symfony Standard Edition) (javiereguiluz)
59+
* `#5888<https://github.com/symfony/symfony-docs/pull/5888>`_ Removed the use of ContainerAware class (javiereguiluz)
60+
* `#5625<https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT (nicolas-grekas)
61+
* `#5896<https://github.com/symfony/symfony-docs/pull/5896>`_ [Book][Templating] Update absolute URL asset to match 2.7 (lemoinem)
62+
* `#5828<https://github.com/symfony/symfony-docs/pull/5828>`_ move the getEntityManager, only get it if needed (OskarStark)
63+
* `#5900<https://github.com/symfony/symfony-docs/pull/5900>`_ Added new security advisories to the docs (fabpot)
64+
* `#5897<https://github.com/symfony/symfony-docs/pull/5897>`_ Fixed some wrong line number references in doctrine.rst (DigNative)
65+
* `#5895<https://github.com/symfony/symfony-docs/pull/5895>`_ Update debug_formatter.rst (strannik-06)
66+
* `#5883<https://github.com/symfony/symfony-docs/pull/5883>`_ Book: Update Service Container Documentation (zanderbaldwin)
67+
* `#5868<https://github.com/symfony/symfony-docs/pull/5868>`_ [2.8] Make screenshots with the new profiler/web dev toolbar design (WouterJ)
68+
* `#5862<https://github.com/symfony/symfony-docs/pull/5862>`_ Fixes done automatically by the docbot (WouterJ)
69+
* `#5851<https://github.com/symfony/symfony-docs/pull/5851>`_ updated sentence (OskarStark)
70+
* `#5870<https://github.com/symfony/symfony-docs/pull/5870>`_ Update securing_services.rst (aruku)
71+
* `#5859<https://github.com/symfony/symfony-docs/pull/5859>`_ Use Twig highlighter instead of Jinja (WouterJ)
72+
* `#5866<https://github.com/symfony/symfony-docs/pull/5866>`_ Fixed little typo with a twig example (artf)
73+
* `#5849<https://github.com/symfony/symfony-docs/pull/5849>`_ Clarified ambiguous wording (ThomasLandauer)
74+
* `#5826<https://github.com/symfony/symfony-docs/pull/5826>`_ "setup" is a noun or adjective, "set up" is the verb (carlos-granados)
75+
* `#5816<https://github.com/symfony/symfony-docs/pull/5816>`_ Merge branches (nicolas-grekas, snoek09, WouterJ, xabbuh)
76+
* `#5813<https://github.com/symfony/symfony-docs/pull/5813>`_ use constants to choose generated URL type (xabbuh)
77+
* `#5808<https://github.com/symfony/symfony-docs/pull/5808>`_ Reworded the explanation about flash messages (javiereguiluz)
78+
* `#5809<https://github.com/symfony/symfony-docs/pull/5809>`_ Minor fix (javiereguiluz)
79+
* `#5807<https://github.com/symfony/symfony-docs/pull/5807>`_ Minor rewordings for the "deprecated" service option (javiereguiluz)
80+
* `#5805<https://github.com/symfony/symfony-docs/pull/5805>`_ Mentioned the BETA and RC support for the Symfony Installer (javiereguiluz)
81+
* `#5781<https://github.com/symfony/symfony-docs/pull/5781>`_ Added annotations example to Linking to Pages examples (carlos-granados)
82+
* `#5780<https://github.com/symfony/symfony-docs/pull/5780>`_ Clarify when we are talking about PHP and Twig (carlos-granados)
83+
* `#5767<https://github.com/symfony/symfony-docs/pull/5767>`_ [Cookbook][Security] clarify description of the getPosition() method (xabbuh)
84+
* `#5731<https://github.com/symfony/symfony-docs/pull/5731>`_ [Cookbook][Security] update versionadded directive to match the content (xabbuh)
85+
* `#5681<https://github.com/symfony/symfony-docs/pull/5681>`_ Update storage.rst (jls2933)
86+
* `#5363<https://github.com/symfony/symfony-docs/pull/5363>`_ Added description on how to enable the security:check command through… (bizmate)
87+
* `#5841<https://github.com/symfony/symfony-docs/pull/5841>`_ [Cookbook][Psr7] fix zend-diactoros Packagist link (xabbuh)
88+
* `#5850<https://github.com/symfony/symfony-docs/pull/5850>`_ Fixed typo (tobiassjosten)
89+
* `#5852<https://github.com/symfony/symfony-docs/pull/5852>`_ Fix doc for 2.6+, `server:start` replace `...:run` (Kevinrob)
90+
* `#5837<https://github.com/symfony/symfony-docs/pull/5837>`_ Corrected link to ConEmu (dritter)
91+
92+
93+
October, 2015
94+
-------------
95+
96+
New Documentation
97+
~~~~~~~~~~~~~~~~~
98+
99+
* `#5345<https://github.com/symfony/symfony-docs/pull/5345>`_ Adding information about empty files sent using BinaryFileResponse. (kherge)
100+
* `#5214<https://github.com/symfony/symfony-docs/pull/5214>`_ [WIP] Reworking most of the registration form: (weaverryan)
101+
* `#5051<https://github.com/symfony/symfony-docs/pull/5051>`_ Rename CollectionType entry options (WouterJ)
102+
* `#5677<https://github.com/symfony/symfony-docs/pull/5677>`_ replacing deprecated usage of True, False, Null validators in docs (Tim Stamp)
103+
* `#5314<https://github.com/symfony/symfony-docs/pull/5314>`_ Documented the useAttributeAsKey() method (javiereguiluz)
104+
* `#5377<https://github.com/symfony/symfony-docs/pull/5377>`_ Added a cookbook section about event subscribers (beni0888, javiereguiluz)
105+
* `#5623<https://github.com/symfony/symfony-docs/pull/5623>`_ [Validator] added BIC validator (mvhirsch)
106+
* `#5689<https://github.com/symfony/symfony-docs/pull/5689>`_ [DI] Add some documentation for the deprecation feature (Taluu)
107+
* `#5592<https://github.com/symfony/symfony-docs/pull/5592>`_ Updated the article about data collectors (javiereguiluz)
108+
* `#5745<https://github.com/symfony/symfony-docs/pull/5745>`_ [Translation] Ability to format a message catalogue without actually writing it. (aitboudad)
109+
* `#5702<https://github.com/symfony/symfony-docs/pull/5702>`_ Added a reference to the Foundation form theme (totophe)
110+
111+
Fixed Documentation
112+
~~~~~~~~~~~~~~~~~~~
113+
114+
* `#5795<https://github.com/symfony/symfony-docs/pull/5795>`_ Fix typo in UserType class (Dorozhko-Anton)
115+
* `#5758<https://github.com/symfony/symfony-docs/pull/5758>`_ symlink issues with php-fpm (kendrick-k)
116+
117+
Minor Documentation Changes
118+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
119+
120+
* `#5843<https://github.com/symfony/symfony-docs/pull/5843>`_ Fixed the YAML syntax for service references (javiereguiluz)
121+
* `#5797<https://github.com/symfony/symfony-docs/pull/5797>`_ [Process] use ProcessFailedException instead of RuntimeException. (aitboudad)
122+
* `#5812<https://github.com/symfony/symfony-docs/pull/5812>`_ Remove duplicate and confusing info about testing error pages (carlos-granados)
123+
* `#5821<https://github.com/symfony/symfony-docs/pull/5821>`_ Minor fixes in the HttpFoundation introduction article (javiereguiluz)
124+
* `#5822<https://github.com/symfony/symfony-docs/pull/5822>`_ Fixed a syntax issue (javiereguiluz)
125+
* `#5817<https://github.com/symfony/symfony-docs/pull/5817>`_ fix version for `entry_options` and `entry_type` (craue)
126+
* `#5796<https://github.com/symfony/symfony-docs/pull/5796>`_ Fix for #5783 (BenjaminPaap)
127+
* `#5810<https://github.com/symfony/symfony-docs/pull/5810>`_ Fixed a typo (javiereguiluz)
128+
* `#5784<https://github.com/symfony/symfony-docs/pull/5784>`_ Add fe80::1 (j-d)
129+
* `#5799<https://github.com/symfony/symfony-docs/pull/5799>`_ make file path consitent with other articles (OskarStark)
130+
* `#5794<https://github.com/symfony/symfony-docs/pull/5794>`_ Minor tweaks for the registration form article (javiereguiluz)
131+
* `#5801<https://github.com/symfony/symfony-docs/pull/5801>`_ namespace fix (OskarStark)
132+
* `#5792<https://github.com/symfony/symfony-docs/pull/5792>`_ [Cookbook][EventDispatcher] fix build (xabbuh)
133+
* `#5787<https://github.com/symfony/symfony-docs/pull/5787>`_ Definition Tweaks - see #5314 (weaverryan)
134+
* `#5777<https://github.com/symfony/symfony-docs/pull/5777>`_ Update links (thewilkybarkid)
135+
* `#5775<https://github.com/symfony/symfony-docs/pull/5775>`_ Misspelling (carlos-granados)
136+
* `#5664<https://github.com/symfony/symfony-docs/pull/5664>`_ Info about implicit session start (ThomasLandauer)
137+
* `#5744<https://github.com/symfony/symfony-docs/pull/5744>`_ translations have been removed from symfony.com (xabbuh)
138+
* `#5771<https://github.com/symfony/symfony-docs/pull/5771>`_ Remove not existing response constant (amansilla)
139+
* `#5761<https://github.com/symfony/symfony-docs/pull/5761>`_ [DX] [Security] Renamed key to secret (SongoQ)
140+
* `#5766<https://github.com/symfony/symfony-docs/pull/5766>`_ Fixed two typos (ThomasLandauer)
141+
* `#5733<https://github.com/symfony/symfony-docs/pull/5733>`_ [Components][OptionsResolver] adding type hint to normalizer callback (xabbuh)
142+
* `#5561<https://github.com/symfony/symfony-docs/pull/5561>`_ Change default value of cookie_httponly (jderusse)
143+
* `#5678<https://github.com/symfony/symfony-docs/pull/5678>`_ Update HttpFoundation note after recent changes in routing component (senkal)
144+
* `#5643<https://github.com/symfony/symfony-docs/pull/5643>`_ Document how to customize the prototype (daFish, WouterJ)
145+
* `#5584<https://github.com/symfony/symfony-docs/pull/5584>`_ Add DebugBundle config reference (WouterJ)
146+
* `#5753<https://github.com/symfony/symfony-docs/pull/5753>`_ configureOptions(...) : protected => public (lucascherifi)
147+
* `#5750<https://github.com/symfony/symfony-docs/pull/5750>`_ fix YAML syntax highlighting (xabbuh)
148+
* `#5749<https://github.com/symfony/symfony-docs/pull/5749>`_ complete Swiftmailer XML examples (xabbuh)
149+
* `#5730<https://github.com/symfony/symfony-docs/pull/5730>`_ Remove documentation of deprecated console shell (Tobion)
150+
* `#5726<https://github.com/symfony/symfony-docs/pull/5726>`_ Document the support of Mintty for colors (stof)
151+
* `#5708<https://github.com/symfony/symfony-docs/pull/5708>`_ Added caution to call createView after handleRequest (WouterJ)
152+
* `#5640<https://github.com/symfony/symfony-docs/pull/5640>`_ Update controller.rst clarifying automatic deletion for flash messages (miguelvilata)
153+
* `#5578<https://github.com/symfony/symfony-docs/pull/5578>`_ Add supported branches in platform.sh section (WouterJ)
154+
* `#5468<https://github.com/symfony/symfony-docs/pull/5468>`_ [Cookbook][Templating] Add note about cache warming namespaced twig templates (kbond)
155+
* `#5684<https://github.com/symfony/symfony-docs/pull/5684>`_ Fix delivery_whitelist regex (gonzalovilaseca)
156+
* `#5742<https://github.com/symfony/symfony-docs/pull/5742>`_ incorrect: severity is an array key here and not a constant (lbayerl)
157+
158+
16159
September, 2015
17160
---------------
18161

‎components/dependency_injection/_imports-parameters-note.rst.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
# app/config/config.yml
1212
imports:
13-
- { resource:"%kernel.root_dir%/parameters.yml" }
13+
- { resource:'%kernel.root_dir%/parameters.yml' }
1414

1515
.. code-block:: xml
1616

0 commit comments

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