Skip to content

Commit

Permalink
Merge branch '2.8' into 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed Dec 12, 2015
2 parents 276aa1f + 43b0eb8 commit 744bed4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion book/forms.rst
Expand Up @@ -1186,7 +1186,7 @@ type. Create a constructor to your form type to receive the service::
{
private $myService;

public function __construct(MyService $mySevice)
public function __construct(MyService $myService)
{
$this->myService = $myService;
}
Expand Down
2 changes: 1 addition & 1 deletion components/dependency_injection/factories.rst
Expand Up @@ -34,7 +34,7 @@ object::

To make the ``NewsletterManager`` object available as a service, you can
configure the service container to use the
``NewsletterFactory::createNewsletterManager()`` factory method:
``NewsletterManagerFactory::createNewsletterManager()`` factory method:

.. configuration-block::

Expand Down
7 changes: 3 additions & 4 deletions components/form/form_events.rst
Expand Up @@ -194,10 +194,9 @@ View data Same as in ``FormEvents::POST_SET_DATA``

.. sidebar:: ``FormEvents::SUBMIT`` in the Form component

The ``Symfony\Component\Form\Extension\Core\EventListener\ResizeFormListener``
subscribes to the ``FormEvents::SUBMIT`` event in order to remove the
fields that need to be removed whenever manipulating a collection of forms
for which ``allow_delete`` has been enabled.
The ``Symfony\Component\Form\Extension\Core\EventListener\FixUrlProtocolListener``
subscribes to the ``FormEvents::SUBMIT`` event in order to prepend a default
protocol to URL fields that were submitted without a protocol.

C) The ``FormEvents::POST_SUBMIT`` Event
........................................
Expand Down
2 changes: 1 addition & 1 deletion cookbook/doctrine/registration_form.rst
Expand Up @@ -198,7 +198,7 @@ Handling the Form Submission
Next, you need a controller to handle the form. Start by creating a simple
controller for displaying the registration form::

// src/AppBundle/Controller/AccountController.php
// src/AppBundle/Controller/RegistrationController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
Expand Down

0 comments on commit 744bed4

Please sign in to comment.