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

Commitb78a20a

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: Correct a typo: replace "then" by "the". Correct a typo: remove unnecessary "the" word. Remove horizontal scrollbar and change event name to follow conventions Update choice.rst Improve readability support Varnish in configuration blocks
2 parents459052d +69bfac1 commitb78a20a

File tree

7 files changed

+24
-9
lines changed

7 files changed

+24
-9
lines changed

‎components/dependency_injection/definitions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Creating a new Definition
4040
~~~~~~~~~~~~~~~~~~~~~~~~~
4141

4242
If you need to create a new definition rather than manipulate one retrieved
43-
fromthen container then the definition class is:class:`Symfony\\Component\\DependencyInjection\\Definition`.
43+
fromthe container then the definition class is:class:`Symfony\\Component\\DependencyInjection\\Definition`.
4444

4545
Class
4646
~~~~~

‎components/event_dispatcher/traceable_dispatcher.rst‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ Pass the event dispatcher to be wrapped and an instance of the
2121
// the event dispatcher to debug
2222
$eventDispatcher = ...;
2323

24-
$traceableEventDispatcher = new TraceableEventDispatcher($eventDispatcher, new Stopwatch());
24+
$traceableEventDispatcher = new TraceableEventDispatcher(
25+
$eventDispatcher,
26+
new Stopwatch()
27+
);
2528

2629
Now, the ``TraceableEventDispatcher`` can be used like any other event dispatcher
2730
to register event listeners and dispatch events::
@@ -31,11 +34,11 @@ to register event listeners and dispatch events::
3134
// register an event listener
3235
$eventListener = ...;
3336
$priority = ...;
34-
$traceableEventDispatcher->addListener('the-event-name', $eventListener, $priority);
37+
$traceableEventDispatcher->addListener('event.the_name', $eventListener, $priority);
3538

3639
// dispatch an event
3740
$event = ...;
38-
$traceableEventDispatcher->dispatch('the-event-name', $event);
41+
$traceableEventDispatcher->dispatch('event.the_name', $event);
3942

4043
After your application has been processed, you can use the
4144
:method:`Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface::getCalledListeners`

‎conf.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
# adding PhpLexer
2424
fromsphinx.highlightingimportlexers
2525
frompygments.lexers.webimportPhpLexer
26+
frompygments.lexers.agileimportRubyLexer
2627

2728
# -- General configuration -----------------------------------------------------
2829

@@ -100,6 +101,15 @@
100101
lexers['php-annotations']=PhpLexer(startinline=True)
101102
lexers['php-standalone']=PhpLexer(startinline=True)
102103
lexers['php-symfony']=PhpLexer(startinline=True)
104+
lexers['varnish2']=RubyLexer()
105+
lexers['varnish3']=RubyLexer()
106+
lexers['varnish4']=RubyLexer()
107+
108+
config_block= {
109+
'varnish2':'Varnish 2',
110+
'varnish3':'Varnish 3',
111+
'varnish4':'Varnish 4'
112+
}
103113

104114
# use PHP as the primary domain
105115
primary_domain='php'
@@ -264,3 +274,4 @@
264274

265275
# Use PHP syntax highlighting in code examples by default
266276
highlight_language='php'
277+

‎cookbook/bundles/extension.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ container, to ensure all services and parameters are also added to the actual
8484
container.
8585

8686
In the ``load()`` method, you can use PHP code to register service definitions,
87-
but it is more common if you putthethese definitions in a configuration file
87+
but it is more common if you put these definitions in a configuration file
8888
(using the Yaml, XML or PHP format). Luckily, you can use the file loaders in
8989
the extension!
9090

‎cookbook/event_dispatcher/before_after_filters.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ event listeners, you can learn more about them at :doc:`/cookbook/service_contai
125125
$controller = $event->getController();
126126

127127
/*
128-
* $controller passed can be either a class or a Closure. This is not usual in Symfony but it may happen.
128+
* $controller passed can be either a class or a Closure.
129+
* This is not usual in Symfony but it may happen.
129130
* If it is a class, it comes in array format
130131
*/
131132
if (!is_array($controller)) {
@@ -189,7 +190,7 @@ want.
189190
After Filters with the ``kernel.response`` Event
190191
------------------------------------------------
191192

192-
In addition to having a "hook" that's executed before your controller, you
193+
In addition to having a "hook" that's executed*before* your controller, you
193194
can also add a hook that's executed *after* your controller. For this example,
194195
imagine that you want to add a sha1 hash (with a salt using that token) to
195196
all responses that have passed this token authentication.

‎reference/forms/types/choice.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ With this option you can also allow float values to be selected as data.
119119
120120
// ...
121121
$builder->add('status', 'choice', array(
122-
'choice_list' => new ChoiceList(array(1, 0.5), array('Full', 'Half')
122+
'choice_list' => new ChoiceList(array(1, 0.5), array('Full', 'Half'))
123123
));
124124
125125
..include::/reference/forms/types/options/empty_value.rst.inc

0 commit comments

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