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

Commit10021a5

Browse files
committed
Merge branch '2.2' into 2.3
Conflicts:cookbook/form/unit_testing.rst
2 parentsf378ac4 +4725f4f commit10021a5

File tree

11 files changed

+26
-23
lines changed

11 files changed

+26
-23
lines changed

‎book/controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ value to each variable.
497497
:ref:`sub request<http-kernel-sub-requests>` is executed via the ``http_kernel``
498498
service the ``HttpKernel`` returns a ``Response`` object::
499499
500-
use Symfony\Component\HttpKernel/HttpKernelInterface;
500+
use Symfony\Component\HttpKernel\HttpKernelInterface;
501501
502502
$path = array(
503503
'_controller' => 'AcmeHelloBundle:Hello:fancy',

‎book/propel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ Now, try the code in action. Imagine you're inside a controller::
397397
}
398398
}
399399

400-
Now, a single row is added to both the ``category`` and product tables. The
400+
Now, a single row is added to both the ``category`` and``product`` tables. The
401401
``product.category_id`` column for the new product is set to whatever the id is
402402
of the new category. Propel manages the persistence of this relationship for
403403
you.

‎book/translation.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -520,15 +520,13 @@ via the ``request`` object::
520520

521521
$request->setLocale('en_US');
522522

523-
..index::
524-
single: Translations; Fallback and default locale
525-
526-
It is also possible to store the locale in the session instead of on a per
527-
request basis. If you do this, each subsequent request will have this locale.
523+
..tip::
528524

529-
..code-block::php
525+
Read:doc:`/cookbook/session/locale_sticky_session` to learn, how to store
526+
the user's locale in the session.
530527

531-
$this->get('session')->set('_locale', 'en_US');
528+
..index::
529+
single: Translations; Fallback and default locale
532530

533531
See the:ref:`book-translation-locale-url` section below about setting the
534532
locale via routing.

‎components/dependency_injection/parameters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ key, and define the type as ``constant``.
275275
276276
..note::
277277

278-
This does notworks for Yaml configuration. If you're using Yaml, you can
278+
This does notwork for Yaml configuration. If you're using Yaml, you can
279279
import an XML file to take advantage of this functionality:
280280

281281
..configuration-block::

‎components/event_dispatcher/introduction.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,11 @@ The ``addListener()`` method takes up to three arguments:
143143
* A PHP callable that will be notified when an event is thrown that it listens
144144
to;
145145

146-
* An optional priority integer (higher equals more important) that determines
147-
when a listener is triggered versus other listeners (defaults to ``0``). If
148-
two listeners have the same priority, they are executed in the order that
149-
they were added to the dispatcher.
146+
* An optional priority integer (higher equals more important, and therefore
147+
that the listener will be triggered earlier) that determines when a listener
148+
is triggered versus other listeners (defaults to ``0``). If two listeners
149+
have the same priority, they are executed in the order that they were added
150+
to the dispatcher.
150151

151152
..note::
152153

‎components/options_resolver.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ value you guess based on the host. You can do that easily by using a
194194
Closure as the default value::
195195

196196
use Symfony\Component\OptionsResolver\Options;
197+
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
197198

198199
// ...
199200
protected function setDefaultOptions(OptionsResolverInterface $resolver)
@@ -202,7 +203,7 @@ Closure as the default value::
202203

203204
$resolver->setDefaults(array(
204205
'port' => function (Options $options) {
205-
if (in_array($options['host'], array('127.0.0.1', 'localhost')) {
206+
if (in_array($options['host'], array('127.0.0.1', 'localhost'))) {
206207
return 80;
207208
}
208209

@@ -300,7 +301,7 @@ need to use the other options for normalizing::
300301

301302
$resolver->setNormalizers(array(
302303
'host' => function (Options $options, $value) {
303-
if (!in_array(substr($value, 0, 7), array('http://', 'https://')) {
304+
if (!in_array(substr($value, 0, 7), array('http://', 'https://'))) {
304305
if ($options['ssl']) {
305306
$value = 'https://'.$value;
306307
} else {

‎cookbook/assetic/asset_management.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ directly:
1818

1919
..code-block::html+jinja
2020

21-
<script src="{{ asset('js/script.js') }}" type="text/javascript" />
21+
<script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
2222

2323
..code-block::php
2424
25-
<scriptsrc="<?php echo $view['assets']->getUrl('js/script.js') ?>"type="text/javascript" />
25+
<scriptsrc="<?php echo $view['assets']->getUrl('js/script.js') ?>"type="text/javascript"></script>
2626
2727
But *with* Assetic, you can manipulate these assets however you want (or
2828
load them from anywhere) before serving them. This means you can:

‎cookbook/form/unit_testing.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ on other extensions. You need add those extensions to the factory object::
168168
use Acme\TestBundle\Form\Type\TestedType;
169169
use Acme\TestBundle\Model\TestObject;
170170
use Symfony\Component\Form\Test\TypeTestCase;
171+
use Symfony\Component\Form\Forms;
172+
use Symfony\Component\Form\FormBuilder;
173+
use Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension;
171174

172175
class TestedTypeTest extends TypeTestCase
173176
{

‎cookbook/form/use_empty_data.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ How to configure Empty Data for a Form Class
77
The ``empty_data`` option allows you to specify an empty data set for your
88
form class. This empty data set would be used if you submit your form, but
99
haven't called ``setData()`` on your form or passed in data when you created
10-
you form. For example::
10+
your form. For example::
1111

1212
public function indexAction()
1313
{

‎cookbook/logging/monolog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ your controller::
1717
{
1818
$logger = $this->get('logger');
1919
$logger->info('I just got the logger');
20-
$logger->err('An error occurred');
20+
$logger->error('An error occurred');
2121

2222
// ...
2323
}
2424

25-
The ``logger`` service has different methods for differentthelogging levels.
25+
The ``logger`` service has different methods for different logging levels.
2626
See:class:`Symfony\\Component\\HttpKernel\\Log\\LoggerInterface` for details
2727
on which methods are available.
2828

‎reference/constraints/Regex.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ specify the html5 compatible pattern in the ``htmlPattern`` option:
214214
class Author
215215
{
216216
/**
217-
* @Assert\Regex({
217+
* @Assert\Regex(
218218
* pattern = "/^[a-z]+$/i",
219219
* htmlPattern = "^[a-zA-Z]+$"
220-
*})
220+
* )
221221
*/
222222
protected $name;
223223
}

0 commit comments

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