From 0282f705baa3401d865d3fbc2238340cf4c31e9d Mon Sep 17 00:00:00 2001 From: Nikita Konstantinov Date: Mon, 31 Dec 2012 22:32:06 +0400 Subject: [PATCH 1/2] fix typos in 2.0 --- book/http_fundamentals.rst | 2 +- book/propel.rst | 2 +- book/validation.rst | 2 +- components/console/single_command_tool.rst | 2 +- components/dependency_injection/compilation.rst | 2 +- components/event_dispatcher/introduction.rst | 2 +- components/routing/introduction.rst | 6 +++--- components/security/authentication.rst | 12 +++++++----- cookbook/form/create_form_type_extension.rst | 1 + cookbook/security/custom_provider.rst | 2 +- reference/constraints/Callback.rst | 1 + reference/dic_tags.rst | 2 +- 12 files changed, 20 insertions(+), 16 deletions(-) diff --git a/book/http_fundamentals.rst b/book/http_fundamentals.rst index 0cc1bc77356..c39d0889856 100644 --- a/book/http_fundamentals.rst +++ b/book/http_fundamentals.rst @@ -366,7 +366,7 @@ on that value. This can get ugly quickly:: $request = Request::createFromGlobals(); $path = $request->getPathInfo(); // the URI path being requested - if (in_array($path, array('', '/')) { + if (in_array($path, array('', '/'))) { $response = new Response('Welcome to the homepage.'); } elseif ($path == '/contact') { $response = new Response('Contact us'); diff --git a/book/propel.rst b/book/propel.rst index 612257e0ac4..374803c1f20 100644 --- a/book/propel.rst +++ b/book/propel.rst @@ -263,7 +263,7 @@ If you want to reuse some queries, you can add your own methods to the public function filterByExpensivePrice() { return $this - ->filterByPrice(array('min' => 1000)) + ->filterByPrice(array('min' => 1000)); } } diff --git a/book/validation.rst b/book/validation.rst index 9565bd272de..e6495e13d22 100644 --- a/book/validation.rst +++ b/book/validation.rst @@ -825,7 +825,7 @@ it looks like this:: // this IS a valid email address, do something } else { // this is *not* a valid email address - $errorMessage = $errorList[0]->getMessage() + $errorMessage = $errorList[0]->getMessage(); // ... do something with the error } diff --git a/components/console/single_command_tool.rst b/components/console/single_command_tool.rst index b3ff5172305..ba3cceffbf9 100644 --- a/components/console/single_command_tool.rst +++ b/components/console/single_command_tool.rst @@ -37,7 +37,7 @@ it is possible to remove this need by extending the application:: { // Keep the core default commands to have the HelpCommand // which is used when using the --help option - $defaultCommands = parent::getDefaultCommands() + $defaultCommands = parent::getDefaultCommands(); $defaultCommands[] = new MyCommand(); diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst index b7c54d19484..c136a4149ba 100644 --- a/components/dependency_injection/compilation.rst +++ b/components/dependency_injection/compilation.rst @@ -213,7 +213,7 @@ benefit of merging multiple files and validation of the configuration:: $processor = new Processor(); $config = $processor->processConfiguration($configuration, $configs); - $container->setParameter('acme_demo.FOO', $config['foo']) + $container->setParameter('acme_demo.FOO', $config['foo']); // ... } diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index 7a81daeda05..e40c6754ea3 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -190,7 +190,7 @@ event to determine the exact ``Symfony\Component\EventDispatcher\Event`` instance that's being passed. For example, the ``kernel.event`` event passes an instance of ``Symfony\Component\HttpKernel\Event\FilterResponseEvent``:: - use Symfony\Component\HttpKernel\Event\FilterResponseEvent + use Symfony\Component\HttpKernel\Event\FilterResponseEvent; public function onKernelResponse(FilterResponseEvent $event) { diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst index e4ca99543fd..19d882cac59 100644 --- a/components/routing/introduction.rst +++ b/components/routing/introduction.rst @@ -33,7 +33,7 @@ your autoloader to load the Routing component:: use Symfony\Component\Routing\RouteCollection; use Symfony\Component\Routing\Route; - $route = new Route('/foo', array('controller' => 'MyController')) + $route = new Route('/foo', array('controller' => 'MyController')); $routes = new RouteCollection(); $routes->add('route_name', $route); @@ -321,9 +321,9 @@ automatically in the background if you want to use it. A basic example of the $router = new Router( new YamlFileLoader($locator), - "routes.yml", + 'routes.yml', array('cache_dir' => __DIR__.'/cache'), - $requestContext, + $requestContext ); $router->match('/foo/bar'); diff --git a/components/security/authentication.rst b/components/security/authentication.rst index ad9efbf8b78..969b6dded6b 100644 --- a/components/security/authentication.rst +++ b/components/security/authentication.rst @@ -130,11 +130,13 @@ password was valid:: use Symfony\Component\Security\Core\Encoder\EncoderFactory; $userProvider = new InMemoryUserProvider( - array('admin' => array( - // password is "foo" - 'password' => '5FZ2Z8QIkA7UTZ4BYkoC+GsReLf569mSKDsfods6LYQ8t+a8EW9oaircfMpmaLbPBh4FOBiiFyLfuZmTSUwzZg==', - 'roles' => array('ROLE_ADMIN'), - ), + array( + 'admin' => array( + // password is "foo" + 'password' => '5FZ2Z8QIkA7UTZ4BYkoC+GsReLf569mSKDsfods6LYQ8t+a8EW9oaircfMpmaLbPBh4FOBiiFyLfuZmTSUwzZg==', + 'roles' => array('ROLE_ADMIN'), + ), + ) ); // for some extra checks: is account enabled, locked, expired, etc.? diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst index 3e25f512295..cd59311b3e1 100644 --- a/cookbook/form/create_form_type_extension.rst +++ b/cookbook/form/create_form_type_extension.rst @@ -168,6 +168,7 @@ database):: return $webPath; } + } Your form type extension class will need to do two things in order to extend the ``file`` form type: diff --git a/cookbook/security/custom_provider.rst b/cookbook/security/custom_provider.rst index 7367bb14556..fd1c7015105 100644 --- a/cookbook/security/custom_provider.rst +++ b/cookbook/security/custom_provider.rst @@ -134,7 +134,7 @@ Here's an example of how this might look:: // ... - return new WebserviceUser($username, $password, $salt, $roles) + return new WebserviceUser($username, $password, $salt, $roles); } throw new UsernameNotFoundException(sprintf('Username "%s" does not exist.', $username)); diff --git a/reference/constraints/Callback.rst b/reference/constraints/Callback.rst index fa36d443e87..acf2f9ce264 100644 --- a/reference/constraints/Callback.rst +++ b/reference/constraints/Callback.rst @@ -88,6 +88,7 @@ those errors should be attributed:: $context->addViolationAtSubPath('firstname', 'This name sounds totally fake!', array(), null); } } + } Options ------- diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index f661fde6e61..c744e5a9115 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -619,7 +619,7 @@ other source, first create a class that implements the // src/Acme/MainBundle/Translation/MyCustomLoader.php namespace Acme\MainBundle\Translation; - use Symfony\Component\Translation\Loader\LoaderInterface + use Symfony\Component\Translation\Loader\LoaderInterface; use Symfony\Component\Translation\MessageCatalogue; class MyCustomLoader implements LoaderInterface From 484901b54c48ba9ed04a03b2621f9ac45e307720 Mon Sep 17 00:00:00 2001 From: Nikita Konstantinov Date: Mon, 31 Dec 2012 22:32:06 +0400 Subject: [PATCH 2/2] fix typos in 2.1 --- components/event_dispatcher/generic_event.rst | 2 +- cookbook/bundles/extension.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/event_dispatcher/generic_event.rst b/components/event_dispatcher/generic_event.rst index 64333c92be0..e7a3dd5be36 100644 --- a/components/event_dispatcher/generic_event.rst +++ b/components/event_dispatcher/generic_event.rst @@ -74,7 +74,7 @@ the event arguments:: $event = new GenericEvent( $subject, - array('type' => 'foo', 'counter' => 0)) + array('type' => 'foo', 'counter' => 0) ); $dispatcher->dispatch('foo', $event); diff --git a/cookbook/bundles/extension.rst b/cookbook/bundles/extension.rst index aed9e8f4090..32c837b333e 100644 --- a/cookbook/bundles/extension.rst +++ b/cookbook/bundles/extension.rst @@ -527,6 +527,7 @@ Comments and examples can be added to your configuration nodes using the return $treeBuilder; } + } This text appears as yaml comments in the output of the ``config:dump-reference`` command.