From 7006c02a1e3839d5eec119ccb70a8c775d311f54 Mon Sep 17 00:00:00 2001 From: Andrew M Date: Mon, 10 Mar 2014 18:10:07 +0200 Subject: [PATCH] Minimize horizontal scrolling, add missing characters. --- components/options_resolver.rst | 7 +++++-- components/property_access/introduction.rst | 10 +++++++--- components/security/firewall.rst | 12 +++++++++--- components/stopwatch.rst | 14 +++++++------- components/templating/helpers/slotshelper.rst | 4 +++- components/translation/introduction.rst | 7 ++++++- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/components/options_resolver.rst b/components/options_resolver.rst index 3eed8478d7b..acb4d1bc553 100644 --- a/components/options_resolver.rst +++ b/components/options_resolver.rst @@ -107,7 +107,8 @@ the ``OptionsResolver`` class:: protected function configureOptions(OptionsResolverInterface $resolver) { - // ... configure the resolver, you will learn this in the sections below + // ... configure the resolver, you will learn this + // in the sections below } } @@ -256,7 +257,9 @@ again. When using a closure as the new value it is passed 2 arguments: $resolver->setDefaults(array( 'encryption' => 'tls', // simple overwrite 'host' => function (Options $options, $previousValue) { - return 'localhost' == $previousValue ? '127.0.0.1' : $previousValue; + return 'localhost' == $previousValue + ? '127.0.0.1' + : $previousValue; }, )); } diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst index 37a56d4dfd5..22ad48b9a2e 100644 --- a/components/property_access/introduction.rst +++ b/components/property_access/introduction.rst @@ -196,7 +196,9 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert { $property = lcfirst(substr($name, 3)); if ('get' === substr($name, 0, 3)) { - return isset($this->children[$property]) ? $this->children[$property] : null; + return isset($this->children[$property]) + ? $this->children[$property] + : null; } elseif ('set' === substr($name, 0, 3)) { $value = 1 == count($args) ? $args[0] : null; $this->children[$property] = $value; @@ -289,7 +291,9 @@ see `Enable other Features`_. { $property = lcfirst(substr($name, 3)); if ('get' === substr($name, 0, 3)) { - return isset($this->children[$property]) ? $this->children[$property] : null; + return isset($this->children[$property]) + ? $this->children[$property] + : null; } elseif ('set' === substr($name, 0, 3)) { $value = 1 == count($args) ? $args[0] : null; $this->children[$property] = $value; @@ -307,7 +311,7 @@ see `Enable other Features`_. $accessor->setValue($person, 'wouter', array(...)); - echo $person->getWouter() // array(...) + echo $person->getWouter(); // array(...) Mixing Objects and Arrays ------------------------- diff --git a/components/security/firewall.rst b/components/security/firewall.rst index 0817662db65..2c19dd9c6c5 100644 --- a/components/security/firewall.rst +++ b/components/security/firewall.rst @@ -12,14 +12,17 @@ certain action or resource of the application:: use Symfony\Component\Security\Core\SecurityContext; use Symfony\Component\Security\Core\Exception\AccessDeniedException; - + // instance of Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface $authenticationManager = ...; // instance of Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface $accessDecisionManager = ...; - $securityContext = new SecurityContext($authenticationManager, $accessDecisionManager); + $securityContext = new SecurityContext( + $authenticationManager, + $accessDecisionManager + ); // ... authenticate the user @@ -71,7 +74,10 @@ with the event dispatcher that is used by the :class:`Symfony\\Component\\HttpKe $firewall = new Firewall($map, $dispatcher); - $dispatcher->addListener(KernelEvents::REQUEST, array($firewall, 'onKernelRequest'); + $dispatcher->addListener( + KernelEvents::REQUEST, + array($firewall, 'onKernelRequest') + ); The firewall is registered to listen to the ``kernel.request`` event that will be dispatched by the HttpKernel at the beginning of each request diff --git a/components/stopwatch.rst b/components/stopwatch.rst index 3ac7f760a66..a839b432ddf 100644 --- a/components/stopwatch.rst +++ b/components/stopwatch.rst @@ -68,13 +68,13 @@ call:: In addition to periods, you can get other useful information from the event object. For example:: - $event->getCategory(); // Returns the category the event was started in - $event->getOrigin(); // Returns the event start time in milliseconds - $event->ensureStopped(); // Stops all periods not already stopped - $event->getStartTime(); // Returns the start time of the very first period - $event->getEndTime(); // Returns the end time of the very last period - $event->getDuration(); // Returns the event duration, including all periods - $event->getMemory(); // Returns the max memory usage of all periods + $event->getCategory(); // Returns the category the event was started in + $event->getOrigin(); // Returns the event start time in milliseconds + $event->ensureStopped(); // Stops all periods not already stopped + $event->getStartTime(); // Returns the start time of the very first period + $event->getEndTime(); // Returns the end time of the very last period + $event->getDuration(); // Returns the event duration, including all periods + $event->getMemory(); // Returns the max memory usage of all periods Sections -------- diff --git a/components/templating/helpers/slotshelper.rst b/components/templating/helpers/slotshelper.rst index cd01977616f..c264b2244e2 100644 --- a/components/templating/helpers/slotshelper.rst +++ b/components/templating/helpers/slotshelper.rst @@ -24,7 +24,9 @@ display the content of the slot on that place: - <?php $view['slots']->output('title', 'Default title') ?> + + <?php $view['slots']->output('title', 'Default title') ?> + output('_content') ?> diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst index 9ccc34c74ed..ca1df51756b 100644 --- a/components/translation/introduction.rst +++ b/components/translation/introduction.rst @@ -190,7 +190,12 @@ loaded like this:: $translator->addResource('xliff', 'messages.fr.xliff', 'fr_FR'); $translator->addResource('xliff', 'admin.fr.xliff', 'fr_FR', 'admin'); - $translator->addResource('xliff', 'navigation.fr.xliff', 'fr_FR', 'navigation'); + $translator->addResource( + 'xliff', + 'navigation.fr.xliff', + 'fr_FR', + 'navigation' + ); When translating strings that are not in the default domain (``messages``), you must specify the domain as the third argument of ``trans()``::