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
Appearance settings

Commit 1b4f6a6

Browse filesBrowse files
weaverryanweaverryan
committed
minor #3656 Minimize horizontal scrolling, add missing characters, remove trailing whitespace. (ifdattic)
This PR was merged into the 2.3 branch. Discussion ---------- Minimize horizontal scrolling, add missing characters, remove trailing whitespace. | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3 | Fixed tickets | Commits ------- 7006c02 Minimize horizontal scrolling, add missing characters.
2 parents 7c0c5d1 + 7006c02 commit 1b4f6a6
Copy full SHA for 1b4f6a6

File tree

Expand file treeCollapse file tree

6 files changed

+37
-17
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+37
-17
lines changed

‎components/options_resolver.rst

Copy file name to clipboardExpand all lines: components/options_resolver.rst
+5-2Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ the ``OptionsResolver`` class::
107107

108108
protected function configureOptions(OptionsResolverInterface $resolver)
109109
{
110-
// ... configure the resolver, you will learn this in the sections below
110+
// ... configure the resolver, you will learn this
111+
// in the sections below
111112
}
112113
}
113114

@@ -256,7 +257,9 @@ again. When using a closure as the new value it is passed 2 arguments:
256257
$resolver->setDefaults(array(
257258
'encryption' => 'tls', // simple overwrite
258259
'host' => function (Options $options, $previousValue) {
259-
return 'localhost' == $previousValue ? '127.0.0.1' : $previousValue;
260+
return 'localhost' == $previousValue
261+
? '127.0.0.1'
262+
: $previousValue;
260263
},
261264
));
262265
}

‎components/property_access/introduction.rst

Copy file name to clipboardExpand all lines: components/property_access/introduction.rst
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,9 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert
196196
{
197197
$property = lcfirst(substr($name, 3));
198198
if ('get' === substr($name, 0, 3)) {
199-
return isset($this->children[$property]) ? $this->children[$property] : null;
199+
return isset($this->children[$property])
200+
? $this->children[$property]
201+
: null;
200202
} elseif ('set' === substr($name, 0, 3)) {
201203
$value = 1 == count($args) ? $args[0] : null;
202204
$this->children[$property] = $value;
@@ -289,7 +291,9 @@ see `Enable other Features`_.
289291
{
290292
$property = lcfirst(substr($name, 3));
291293
if ('get' === substr($name, 0, 3)) {
292-
return isset($this->children[$property]) ? $this->children[$property] : null;
294+
return isset($this->children[$property])
295+
? $this->children[$property]
296+
: null;
293297
} elseif ('set' === substr($name, 0, 3)) {
294298
$value = 1 == count($args) ? $args[0] : null;
295299
$this->children[$property] = $value;
@@ -307,7 +311,7 @@ see `Enable other Features`_.
307311
308312
$accessor->setValue($person, 'wouter', array(...));
309313
310-
echo $person->getWouter() // array(...)
314+
echo $person->getWouter(); // array(...)
311315
312316
Mixing Objects and Arrays
313317
-------------------------

‎components/security/firewall.rst

Copy file name to clipboardExpand all lines: components/security/firewall.rst
+9-3Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ certain action or resource of the application::
1212

1313
use Symfony\Component\Security\Core\SecurityContext;
1414
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
15-
15+
1616
// instance of Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface
1717
$authenticationManager = ...;
1818

1919
// instance of Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface
2020
$accessDecisionManager = ...;
2121

22-
$securityContext = new SecurityContext($authenticationManager, $accessDecisionManager);
22+
$securityContext = new SecurityContext(
23+
$authenticationManager,
24+
$accessDecisionManager
25+
);
2326

2427
// ... authenticate the user
2528

@@ -71,7 +74,10 @@ with the event dispatcher that is used by the :class:`Symfony\\Component\\HttpKe
7174

7275
$firewall = new Firewall($map, $dispatcher);
7376

74-
$dispatcher->addListener(KernelEvents::REQUEST, array($firewall, 'onKernelRequest');
77+
$dispatcher->addListener(
78+
KernelEvents::REQUEST,
79+
array($firewall, 'onKernelRequest')
80+
);
7581

7682
The firewall is registered to listen to the ``kernel.request`` event that
7783
will be dispatched by the HttpKernel at the beginning of each request

‎components/stopwatch.rst

Copy file name to clipboardExpand all lines: components/stopwatch.rst
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ call::
6868
In addition to periods, you can get other useful information from the event object.
6969
For example::
7070

71-
$event->getCategory(); // Returns the category the event was started in
72-
$event->getOrigin(); // Returns the event start time in milliseconds
73-
$event->ensureStopped(); // Stops all periods not already stopped
74-
$event->getStartTime(); // Returns the start time of the very first period
75-
$event->getEndTime(); // Returns the end time of the very last period
76-
$event->getDuration(); // Returns the event duration, including all periods
77-
$event->getMemory(); // Returns the max memory usage of all periods
71+
$event->getCategory(); // Returns the category the event was started in
72+
$event->getOrigin(); // Returns the event start time in milliseconds
73+
$event->ensureStopped(); // Stops all periods not already stopped
74+
$event->getStartTime(); // Returns the start time of the very first period
75+
$event->getEndTime(); // Returns the end time of the very last period
76+
$event->getDuration(); // Returns the event duration, including all periods
77+
$event->getMemory(); // Returns the max memory usage of all periods
7878

7979
Sections
8080
--------

‎components/templating/helpers/slotshelper.rst

Copy file name to clipboardExpand all lines: components/templating/helpers/slotshelper.rst
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ display the content of the slot on that place:
2424
<!doctype html>
2525
<html>
2626
<head>
27-
<title><?php $view['slots']->output('title', 'Default title') ?></title>
27+
<title>
28+
<?php $view['slots']->output('title', 'Default title') ?>
29+
</title>
2830
</head>
2931
<body>
3032
<?php $view['slots']->output('_content') ?>

‎components/translation/introduction.rst

Copy file name to clipboardExpand all lines: components/translation/introduction.rst
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,12 @@ loaded like this::
190190

191191
$translator->addResource('xliff', 'messages.fr.xliff', 'fr_FR');
192192
$translator->addResource('xliff', 'admin.fr.xliff', 'fr_FR', 'admin');
193-
$translator->addResource('xliff', 'navigation.fr.xliff', 'fr_FR', 'navigation');
193+
$translator->addResource(
194+
'xliff',
195+
'navigation.fr.xliff',
196+
'fr_FR',
197+
'navigation'
198+
);
194199

195200
When translating strings that are not in the default domain (``messages``),
196201
you must specify the domain as the third argument of ``trans()``::

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.