Merge branch '2.4'

Author: weaverryan

book/forms.rst

@@ -1006,7 +1006,8 @@ that will house the logic for building the task form::
     {
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
-            $builder->add('task')
+            $builder
+                ->add('task')
                 ->add('dueDate', null, array('widget' => 'single_text'))
                 ->add('save', 'submit');
         }

book/page_creation.rst

@@ -165,7 +165,7 @@ an entry when you generated the ``AcmeHelloBundle``:
         $collection = new RouteCollection();
         $collection->addCollection(
             $loader->import('@AcmeHelloBundle/Resources/config/routing.php'),
-            '/',
+            '/'
         );
 
         return $collection;

book/routing.rst

@@ -558,13 +558,15 @@ is *not* a number).
 As a result, a URL like ``/blog/my-blog-post`` will now properly match the
 ``blog_show`` route.
 
-+--------------------+-----------+-----------------------+
-| URL                | route     | parameters            |
-+====================+===========+=======================+
-| /blog/2            | blog      | {page} = 2            |
-+--------------------+-----------+-----------------------+
-| /blog/my-blog-post | blog_show | {slug} = my-blog-post |
-+--------------------+-----------+-----------------------+
++----------------------+-----------+-------------------------+
+| URL                  | route     | parameters              |
++======================+===========+=========================+
+| /blog/2              | blog      | {page} = 2              |
++----------------------+-----------+-------------------------+
+| /blog/my-blog-post   | blog_show | {slug} = my-blog-post   |
++----------------------+-----------+-------------------------+
+| /blog/2-my-blog-post | blog_show | {slug} = 2-my-blog-post |
++----------------------+-----------+-------------------------+
 
 .. sidebar:: Earlier Routes always Win
 
@@ -1131,7 +1133,7 @@ instead of simply ``/hello/{name}``:
         $acmeHello = $loader->import(
             "@AcmeHelloBundle/Resources/config/routing.php"
         );
-        $acmeHello->setPrefix('/admin');
+        $acmeHello->addPrefix('/admin');
 
         $collection->addCollection($acmeHello);
 

book/security.rst

@@ -1062,6 +1062,73 @@ the user will be redirected to ``https``:
                 ),
             ),
 
+.. _book-security-securing-controller:
+
+Securing a Controller
+~~~~~~~~~~~~~~~~~~~~~
+
+Protecting your application based on URL patterns is easy, but may not be
+fine-grained enough in certain cases. When necessary, you can easily force
+authorization from inside a controller::
+
+    // ...
+    use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+
+    public function helloAction($name)
+    {
+        if (false === $this->get('security.context')->isGranted('ROLE_ADMIN')) {
+            throw new AccessDeniedException();
+        }
+
+        // ...
+    }
+
+.. _book-security-securing-controller-annotations:
+
+Thanks to the SensioFrameworkExtraBundle, you can also secure your controller using annotations::
+
+    // ...
+    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+
+    /**
+     * @Security("has_role('ROLE_ADMIN')")
+     */
+    public function helloAction($name)
+    {
+        // ...
+    }
+
+For more information, see the 
+:doc:`FrameworkExtraBundle documentation </bundles/SensioFrameworkExtraBundle/annotations/security>`.
+
+Securing other Services
+~~~~~~~~~~~~~~~~~~~~~~~
+
+In fact, anything in Symfony can be protected using a strategy similar to
+the one seen in the previous section. For example, suppose you have a service
+(i.e. a PHP class) whose job is to send emails from one user to another.
+You can restrict use of this class - no matter where it's being used from -
+to users that have a specific role.
+
+For more information on how you can use the Security component to secure
+different services and methods in your application, see :doc:`/cookbook/security/securing_services`.
+
+Access Control Lists (ACLs): Securing Individual Database Objects
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Imagine you are designing a blog system where your users can comment on your
+posts. Now, you want a user to be able to edit their own comments, but not
+those of other users. Also, as the admin user, you yourself want to be able
+to edit *all* comments.
+
+The Security component comes with an optional access control list (ACL) system
+that you can use when you need to control access to individual instances
+of an object in your system. *Without* ACL, you can secure your system so that
+only certain users can edit blog comments in general. But *with* ACL, you
+can restrict or allow access on a comment-by-comment basis.
+
+For more information, see the cookbook article: :doc:`/cookbook/security/acl`.
+
 Users
 -----
 
@@ -2091,7 +2158,6 @@ Learn more from the Cookbook
 * :doc:`Access Control Lists (ACLs) </cookbook/security/acl>`
 * :doc:`/cookbook/security/remember_me`
 
-.. _`JMSSecurityExtraBundle`: http://jmsyst.com/bundles/JMSSecurityExtraBundle/1.2
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle
 .. _`implement the \Serializable interface`: http://php.net/manual/en/class.serializable.php
 .. _`functions-online.com`: http://www.functions-online.com/sha1.html

book/validation.rst

@@ -1148,7 +1148,7 @@ section .
 The ``validateValue`` method returns a :class:`Symfony\\Component\\Validator\\ConstraintViolationList`
 object, which acts just like an array of errors. Each error in the collection
 is a :class:`Symfony\\Component\\Validator\\ConstraintViolation` object,
-which holds the error message on its `getMessage` method.
+which holds the error message on its ``getMessage`` method.
 
 Final Thoughts
 --------------

components/console/introduction.rst

@@ -160,7 +160,7 @@ You can also set these colors and options inside the tagname::
     // bold text on a yellow background
     $output->writeln('<bg=yellow;options=bold>foo</bg=yellow;options=bold>');
 
-.. verbosity-levels:
+.. _verbosity-levels:
 
 Verbosity Levels
 ~~~~~~~~~~~~~~~~

components/dependency_injection/factories.rst

@@ -125,7 +125,7 @@ factory itself as a service:
 
         $container->setDefinition('newsletter_factory', new Definition(
             '%newsletter_factory.class%'
-        ))
+        ));
         $container->setDefinition('newsletter_manager', new Definition(
             '%newsletter_manager.class%'
         ))->setFactoryService(
@@ -193,7 +193,7 @@ in the previous example takes the ``templating`` service as an argument:
 
         $container->setDefinition('newsletter_factory', new Definition(
             '%newsletter_factory.class%'
-        ))
+        ));
         $container->setDefinition('newsletter_manager', new Definition(
             '%newsletter_manager.class%',
             array(new Reference('templating'))

components/form/introduction.rst

@@ -84,12 +84,12 @@ object to read data off of the correct PHP superglobals (i.e. ``$_POST`` or
     :class:`Symfony\\Component\\Form\\Extension\\HttpFoundation\\HttpFoundationExtension`
     to your form factory::
 
-    use Symfony\Component\Form\Forms;
-    use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
+        use Symfony\Component\Form\Forms;
+        use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationExtension;
 
-    $formFactory = Forms::createFormFactoryBuilder()
-        ->addExtension(new HttpFoundationExtension())
-        ->getFormFactory();
+        $formFactory = Forms::createFormFactoryBuilder()
+            ->addExtension(new HttpFoundationExtension())
+            ->getFormFactory();
 
     Now, when you process a form, you can pass the :class:`Symfony\\Component\\HttpFoundation\\Request`
     object to :method:`Symfony\\Component\\Form\\Form::handleRequest`::

components/process.rst

@@ -43,11 +43,11 @@ and :method:`Symfony\\Component\\Process\\Process::getIncrementalErrorOutput`
 methods returns the new outputs since the last call.
 
 .. versionadded:: 2.4
-    The ``flushOutput()`` and ``flushErrorOutput()`` methods were added in Symfony 2.4.
+    The ``clearOutput()`` and ``clearErrorOutput()`` methods were added in Symfony 2.4.
 
-The :method:`Symfony\\Component\\Process\\Process::flushOutput` method flushes
+The :method:`Symfony\\Component\\Process\\Process::clearOutput` method clears
 the contents of the output and
-:method:`Symfony\\Component\\Process\\Process::flushErrorOutput` flushes
+:method:`Symfony\\Component\\Process\\Process::clearErrorOutput` clears
 the contents of the error output.
 
 Getting real-time Process Output

cookbook/bundles/remove.rst

@@ -17,7 +17,7 @@ starting a project, but you'll probably want to eventually remove it.
 ---------------------------------------------
 
 To disconnect the bundle from the framework, you should remove the bundle from
-the ``Appkernel::registerBundles()`` method. The bundle is normally found in
+the ``AppKernel::registerBundles()`` method. The bundle is normally found in
 the ``$bundles`` array but the AcmeDemoBundle is only registered in a
 development environment and you can find him in the if statement after::