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

Commit59d6e6e

Browse files
committed
Merge branch '2.2' into 2.3
Conflicts:components/yaml/introduction.rst
2 parentsf20b2e3 +f962e9a commit59d6e6e

File tree

12 files changed

+58
-23
lines changed

12 files changed

+58
-23
lines changed

‎book/doctrine.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ doesn't replace your existing methods).
401401
The ``doctrine:generate:entities`` command saves a backup of the original
402402
``Product.php`` named ``Product.php~``. In some cases, the presence of
403403
this file can cause a "Cannot redeclare class" error. It can be safely
404-
removed.
404+
removed. You can also use the ``--no-backup`` option to prevent generating
405+
these backup files.
405406

406407
Note that you don't *need* to use this command. Doctrine doesn't rely
407408
on code generation. Like with normal PHP classes, you just need to make

‎components/dom_crawler.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Extract attribute and/or node values from the list of nodes::
138138
Call an anonymous function on each node of the list::
139139

140140
$nodeValues = $crawler->filter('p')->each(function ($node, $i) {
141-
return $node->nodeValue;
141+
return $node->text();
142142
});
143143

144144
The anonymous function receives the position and the node as arguments.
@@ -163,7 +163,7 @@ The crawler supports multiple ways of adding the content::
163163
..note::
164164

165165
When dealing with character sets other than ISO-8859-1, always add HTML
166-
content using the:method:`Symfony\\Component\\DomCrawler\\Crawler::addHTMLContent``
166+
content using the:method:`Symfony\\Component\\DomCrawler\\Crawler::addHTMLContent`
167167
method where you can specify the second parameter to be your target character
168168
set.
169169

‎components/yaml/introduction.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,26 @@ error occurred:
120120
As the parser is re-entrant, you can use the same parser object to load
121121
different YAML strings.
122122

123-
When loading a YAML file, it is sometimes better to use the
123+
It may also be convenient to use the
124124
:method:`Symfony\\Component\\Yaml\\Yaml::parse` wrapper method:
125125

126126
..code-block::php
127127
128128
use Symfony\Component\Yaml\Yaml;
129129
130-
$yaml = Yaml::parse('/path/to/file.yml');
130+
$yaml = Yaml::parse(file_get_contents('/path/to/file.yml'));
131131
132132
The:method:`Symfony\\Component\\Yaml\\Yaml::parse` static method takes a YAML
133133
string or a file containing YAML. Internally, it calls the
134134
:method:`Symfony\\Component\\Yaml\\Parser::parse` method, but enhances the
135135
error if something goes wrong by adding the filename to the message.
136136

137+
..caution::
138+
139+
Because it is currently possible to pass a filename to this method, you
140+
must validate the input first. Passing a filename is deprecated in
141+
Symfony 2.2, and will be removed in Symfony 3.0.
142+
137143
Writing YAML Files
138144
~~~~~~~~~~~~~~~~~~
139145

‎cookbook/assetic/asset_management.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ You can see an example in the previous section.
143143
..caution::
144144

145145
When using the ``cssrewrite`` filter, don't refer to your CSS files using
146-
the ``@AcmeFooBundle``. See the note in the above section for details.
146+
the ``@AcmeFooBundle`` syntax. See the note in the above section for details.
147147

148148
Combining Assets
149149
~~~~~~~~~~~~~~~~

‎cookbook/bundles/inheritance.rst‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,9 @@ The same goes for routing files, validation configuration and other resources.
9797

9898
..caution::
9999

100-
Translation files do not work in the same way as described above. All
101-
translation files are accumulated into a set of "pools" (one for each)
102-
domain. Symfony loads translation files from bundles first (in the order
103-
that the bundles are initialized) and then from your ``app/Resources``
104-
directory. If the same translation is specified in two resources, the
105-
translation from the resource that's loaded last will win.
100+
Translation files do not work in the same way as described above. Read
101+
:ref:`override-translations` if you want to learn how to override
102+
translations.
106103

107104
.. _`FOSUserBundle`:https://github.com/friendsofsymfony/fosuserbundle
108105

‎cookbook/bundles/override.rst‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Templates
1111
---------
1212

1313
For information on overriding templates, see
14+
1415
*:ref:`overriding-bundle-templates`.
1516
*:doc:`/cookbook/bundles/inheritance`
1617

@@ -31,6 +32,7 @@ Controllers
3132
Assuming the third-party bundle involved uses non-service controllers (which
3233
is almost always the case), you can easily override controllers via bundle
3334
inheritance. For more information, see:doc:`/cookbook/bundles/inheritance`.
35+
If the controller is a service, see the next section on how to override it.
3436

3537
Services & Configuration
3638
------------------------
@@ -69,7 +71,7 @@ Secondly, if the class is not available as a parameter, you want to make sure th
6971
class is always overridden when your bundle is used, or you need to modify
7072
something beyond just the class name, you should use a compiler pass::
7173

72-
// src/Acme/FooBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
74+
// src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
7375
namespace Acme\DemoBundle\DependencyInjection\Compiler;
7476

7577
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -94,7 +96,11 @@ like adding a method call - you can only use the compiler pass method.
9496
Entities & Entity mapping
9597
-------------------------
9698

97-
In progress...
99+
Due to the way Doctrine works, it is not possible to override entity mapping
100+
of a bundle. However, if a bundle provides a mapped superclass (such as the
101+
``User`` entity in the FOSUserBundle) one can override attributes and
102+
associations. Learn more about this feature and its limitations in
103+
`the Doctrine documentation`_.
98104

99105
Forms
100106
-----
@@ -116,7 +122,22 @@ Validation metadata
116122

117123
In progress...
118124

125+
.. _override-translations:
126+
119127
Translations
120128
------------
121129

122-
In progress...
130+
Translations are not related to bundles, but to domains. That means that you
131+
can override the translations from any translation file, as long as it is in
132+
:ref:`the correct domain<translation-domains>`.
133+
134+
..caution::
135+
136+
The last translation file always wins. That mean that you need to make
137+
sure that the bundle containing *your* translations is loaded after any
138+
bundle whose translations you're overriding. This is done in ``AppKernel``.
139+
140+
The file that always wins is the one that is placed in
141+
``app/Resources/translations``, as those files are always loaded last.
142+
143+
.. _`the Doctrine documentation`:http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/inheritance-mapping.html#overrides

‎cookbook/form/create_form_type_extension.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ it in the view::
239239
}
240240

241241
// set an "image_url" variable that will be available when rendering this field
242-
$view->set('image_url',$imageUrl);
242+
$view->vars['image_url'] =$imageUrl;
243243
}
244244
}
245245

‎cookbook/form/data_transformers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ it's quite easy::
337337
{
338338
$builder
339339
->add('task')
340-
->add('dueDate', null, array('widget' => 'single_text'));
340+
->add('dueDate', null, array('widget' => 'single_text'))
341341
->add('issue', 'issue_selector');
342342
}
343343

‎cookbook/security/custom_authentication_provider.rst‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,9 @@ set an authenticated token in the security context if successful.
137137
138138
try {
139139
$authToken = $this->authenticationManager->authenticate($token);
140-
141140
$this->securityContext->setToken($authToken);
141+
142+
return;
142143
} catch (AuthenticationException $failed) {
143144
// ... you might log something here
144145
@@ -152,6 +153,11 @@ set an authenticated token in the security context if successful.
152153
$event->setResponse($response);
153154
154155
}
156+
157+
// By default deny authorization
158+
$response = new Response();
159+
$response->setStatusCode(403);
160+
$event->setResponse($response);
155161
}
156162
}
157163
@@ -233,6 +239,10 @@ the ``PasswordDigest`` header value matches with the user's password.
233239
if (file_exists($this->cacheDir.'/'.$nonce) && file_get_contents($this->cacheDir.'/'.$nonce) + 300 > time()) {
234240
throw new NonceExpiredException('Previously used nonce detected');
235241
}
242+
// If cache directory does not exist we create it
243+
if (!is_dir($this->cacheDir)) {
244+
mkdir($this->cacheDir, 0777, true);
245+
}
236246
file_put_contents($this->cacheDir.'/'.$nonce, time());
237247
238248
// Validate Secret

‎cookbook/security/voters.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
How to implement your own Voter to blacklist IP Addresses
55
=========================================================
66

7-
The Symfony2 security component provides several layers toauthenticate users.
7+
The Symfony2 security component provides several layers toauthorize users.
88
One of the layers is called a `voter`. A voter is a dedicated class that checks
99
if the user has the rights to be connected to the application. For instance,
10-
Symfony2 provides a layer that checks if the user is fullyauthenticated or if
10+
Symfony2 provides a layer that checks if the user is fullyauthorized or if
1111
it has some expected roles.
1212

1313
It is sometimes useful to create a custom voter to handle a specific case not

0 commit comments

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