diff --git a/book/doctrine.rst b/book/doctrine.rst index afe320c1899..36c2aa01c26 100644 --- a/book/doctrine.rst +++ b/book/doctrine.rst @@ -904,7 +904,7 @@ you can let Doctrine create the class for you. .. code-block:: bash - $ php app/console doctrine:generate:entity \ + $ php app/console doctrine:generate:entity --no-interaction \ --entity="AppBundle:Category" \ --fields="name:string(255)" diff --git a/book/validation.rst b/book/validation.rst index d5f8744b8b5..f454b78e525 100644 --- a/book/validation.rst +++ b/book/validation.rst @@ -217,7 +217,7 @@ The ``validator`` service can be used at any time to validate any object. In reality, however, you'll usually work with the ``validator`` indirectly when working with forms. Symfony's form library uses the ``validator`` service internally to validate the underlying object after values have been submitted. -The constraint violations on the object are converted into ``FieldError`` +The constraint violations on the object are converted into ``FormError`` objects that can easily be displayed with your form. The typical form submission workflow looks like the following from inside a controller:: diff --git a/components/var_dumper/advanced.rst b/components/var_dumper/advanced.rst index 805a3847bd0..ccc0308cad7 100644 --- a/components/var_dumper/advanced.rst +++ b/components/var_dumper/advanced.rst @@ -145,7 +145,7 @@ Another option for doing the same could be:: use Symfony\Component\VarDumper\Cloner\VarCloner; use Symfony\Component\VarDumper\Dumper\CliDumper; - cloner = new VarCloner(); + $cloner = new VarCloner(); $dumper = new CliDumper(); $output = fopen('php://memory', 'r+b'); diff --git a/cookbook/security/pre_authenticated.rst b/cookbook/security/pre_authenticated.rst index 183fe9e91ca..e3501c54884 100644 --- a/cookbook/security/pre_authenticated.rst +++ b/cookbook/security/pre_authenticated.rst @@ -149,5 +149,5 @@ key in the ``remote_user`` firewall configuration. .. note:: Just like for X509 authentication, you will need to configure a "user provider". - See :ref:`the note previous note ` + See :ref:`the previous note ` for more information. diff --git a/create_framework/http-kernel-controller-resolver.rst b/create_framework/http-kernel-controller-resolver.rst index b0393b4cdd3..261ab548cf9 100644 --- a/create_framework/http-kernel-controller-resolver.rst +++ b/create_framework/http-kernel-controller-resolver.rst @@ -91,7 +91,7 @@ introspects the controller signature to determine which arguments to pass to it by using the native PHP `reflection`_. The ``indexAction()`` method needs the Request object as an argument. -```getArguments()`` knows when to inject it properly if it is type-hinted +``getArguments()`` knows when to inject it properly if it is type-hinted correctly:: public function indexAction(Request $request) diff --git a/create_framework/templating.rst b/create_framework/templating.rst index 987a9ea26d1..5d233ecfe37 100644 --- a/create_framework/templating.rst +++ b/create_framework/templating.rst @@ -173,7 +173,7 @@ framework does not need to be modified in any way, just create a new The ``is_leap_year()`` function returns ``true`` when the given year is a leap year, ``false`` otherwise. If the year is ``null``, the current year is tested. The controller is simple: it gets the year from the request -attributes, pass it to the `is_leap_year()`` function, and according to the +attributes, pass it to the ``is_leap_year()`` function, and according to the return value it creates a new Response object. As always, you can decide to stop here and use the framework as is; it's diff --git a/quick_tour/the_architecture.rst b/quick_tour/the_architecture.rst index 354e64b4e84..e9b9816fc21 100644 --- a/quick_tour/the_architecture.rst +++ b/quick_tour/the_architecture.rst @@ -114,7 +114,7 @@ a single Bundle class that describes it:: new Symfony\Bundle\DoctrineBundle\DoctrineBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), - new AppBundle\AppBundle(); + new AppBundle\AppBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) {