Skip to content

Commit daf9d44

Browse files
weaverryanweaverryan
committed
Merge remote-tracking branch 'origin/master'
2 parents bc9b1e0 + 40b2858 commit daf9d44

File tree

17 files changed

+25
-20
lines changed

17 files changed

+25
-20
lines changed

‎book/http_fundamentals.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ on that value. This can get ugly quickly::
366366
$request = Request::createFromGlobals();
367367
$path = $request->getPathInfo(); // the URI path being requested
368368

369-
if (in_array($path, array('', '/')) {
369+
if (in_array($path, array('', '/'))) {
370370
$response = new Response('Welcome to the homepage.');
371371
} elseif ($path == '/contact') {
372372
$response = new Response('Contact us');

‎book/propel.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ If you want to reuse some queries, you can add your own methods to the
263263
public function filterByExpensivePrice()
264264
{
265265
return $this
266-
->filterByPrice(array('min' => 1000))
266+
->filterByPrice(array('min' => 1000));
267267
}
268268
}
269269

‎book/validation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ it looks like this::
825825
// this IS a valid email address, do something
826826
} else {
827827
// this is *not* a valid email address
828-
$errorMessage = $errorList[0]->getMessage()
828+
$errorMessage = $errorList[0]->getMessage();
829829

830830
// ... do something with the error
831831
}

‎components/console/helpers/dialoghelper.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ You can also ask and validate a hidden response::
136136
if (trim($value) == '') {
137137
throw new \Exception('The password can not be empty');
138138
}
139-
}
139+
};
140140

141141
$password = $dialog->askHiddenResponseAndValidate(
142142
$output,

‎components/console/single_command_tool.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ it is possible to remove this need by extending the application::
3737
{
3838
// Keep the core default commands to have the HelpCommand
3939
// which is used when using the --help option
40-
$defaultCommands = parent::getDefaultCommands()
40+
$defaultCommands = parent::getDefaultCommands();
4141

4242
$defaultCommands[] = new MyCommand();
4343

‎components/dependency_injection/compilation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ benefit of merging multiple files and validation of the configuration::
213213
$processor = new Processor();
214214
$config = $processor->processConfiguration($configuration, $configs);
215215

216-
$container->setParameter('acme_demo.FOO', $config['foo'])
216+
$container->setParameter('acme_demo.FOO', $config['foo']);
217217

218218
// ...
219219
}

‎components/event_dispatcher/generic_event.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ the event arguments::
7474

7575
$event = new GenericEvent(
7676
$subject,
77-
array('type' => 'foo', 'counter' => 0))
77+
array('type' => 'foo', 'counter' => 0)
7878
);
7979
$dispatcher->dispatch('foo', $event);
8080

‎components/event_dispatcher/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ event to determine the exact ``Symfony\Component\EventDispatcher\Event``
190190
instance that's being passed. For example, the ``kernel.event`` event passes an
191191
instance of ``Symfony\Component\HttpKernel\Event\FilterResponseEvent``::
192192

193-
use Symfony\Component\HttpKernel\Event\FilterResponseEvent
193+
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
194194

195195
public function onKernelResponse(FilterResponseEvent $event)
196196
{

‎components/http_foundation/introduction.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ If you need to get full access to parsed data from ``Accept``, ``Accept-Language
250250
use Symfony\Component\HttpFoundation\AcceptHeader;
251251

252252
$accept = AcceptHeader::fromString($request->headers->get('Accept'));
253-
if ($accept->has('text/html') {
253+
if ($accept->has('text/html')) {
254254
$item = $accept->get('html');
255255
$charset = $item->getAttribute('charset', 'utf-8');
256256
$quality = $item->getQuality();

‎components/routing/introduction.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ your autoloader to load the Routing component::
3333
use Symfony\Component\Routing\RouteCollection;
3434
use Symfony\Component\Routing\Route;
3535

36-
$route = new Route('/foo', array('controller' => 'MyController'))
36+
$route = new Route('/foo', array('controller' => 'MyController'));
3737
$routes = new RouteCollection();
3838
$routes->add('route_name', $route);
3939

@@ -333,9 +333,9 @@ automatically in the background if you want to use it. A basic example of the
333333

334334
$router = new Router(
335335
new YamlFileLoader($locator),
336-
"routes.yml",
336+
'routes.yml',
337337
array('cache_dir' => __DIR__.'/cache'),
338-
$requestContext,
338+
$requestContext
339339
);
340340
$router->match('/foo/bar');
341341

‎components/security/authentication.rst

+7-5
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,13 @@ password was valid::
130130
use Symfony\Component\Security\Core\Encoder\EncoderFactory;
131131

132132
$userProvider = new InMemoryUserProvider(
133-
array('admin' => array(
134-
// password is "foo"
135-
'password' => '5FZ2Z8QIkA7UTZ4BYkoC+GsReLf569mSKDsfods6LYQ8t+a8EW9oaircfMpmaLbPBh4FOBiiFyLfuZmTSUwzZg==',
136-
'roles' => array('ROLE_ADMIN'),
137-
),
133+
array(
134+
'admin' => array(
135+
// password is "foo"
136+
'password' => '5FZ2Z8QIkA7UTZ4BYkoC+GsReLf569mSKDsfods6LYQ8t+a8EW9oaircfMpmaLbPBh4FOBiiFyLfuZmTSUwzZg==',
137+
'roles' => array('ROLE_ADMIN'),
138+
),
139+
)
138140
);
139141

140142
// for some extra checks: is account enabled, locked, expired, etc.?

‎cookbook/bundles/extension.rst

+1
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,7 @@ Comments and examples can be added to your configuration nodes using the
537537

538538
return $treeBuilder;
539539
}
540+
}
540541

541542
This text appears as yaml comments in the output of the ``config:dump-reference``
542543
command.

‎cookbook/bundles/prepend_extension.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ To give an Extension the power to do this, it needs to implement
2929
namespace Acme\HelloBundle\DependencyInjection;
3030

3131
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
32-
use Symfony\Component\\DependencyInjection\PrependExtensionInterface;
32+
use Symfony\Component\DependencyInjection\PrependExtensionInterface;
3333
use Symfony\Component\DependencyInjection\ContainerBuilder;
3434

3535
class AcmeHelloExtension extends Extension implements PrependExtensionInterface

‎cookbook/form/create_form_type_extension.rst

+1
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ database)::
168168

169169
return $webPath;
170170
}
171+
}
171172

172173
Your form type extension class will need to do two things in order to extend
173174
the ``file`` form type:

‎cookbook/security/custom_provider.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Here's an example of how this might look::
134134

135135
// ...
136136

137-
return new WebserviceUser($username, $password, $salt, $roles)
137+
return new WebserviceUser($username, $password, $salt, $roles);
138138
}
139139

140140
throw new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username));

‎reference/constraints/Callback.rst

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ those errors should be attributed::
8888
$context->addViolationAtSubPath('firstname', 'This name sounds totally fake!', array(), null);
8989
}
9090
}
91+
}
9192

9293
Options
9394
-------

‎reference/dic_tags.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ other source, first create a class that implements the
621621
// src/Acme/MainBundle/Translation/MyCustomLoader.php
622622
namespace Acme\MainBundle\Translation;
623623

624-
use Symfony\Component\Translation\Loader\LoaderInterface
624+
use Symfony\Component\Translation\Loader\LoaderInterface;
625625
use Symfony\Component\Translation\MessageCatalogue;
626626

627627
class MyCustomLoader implements LoaderInterface

0 commit comments

Comments
 (0)