Skip to content

Commit 744bed4

Browse files
committed
Merge branch '2.8' into 3.0
2 parents 276aa1f + 43b0eb8 commit 744bed4

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Diff for: book/forms.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1186,7 +1186,7 @@ type. Create a constructor to your form type to receive the service::
11861186
{
11871187
private $myService;
11881188

1189-
public function __construct(MyService $mySevice)
1189+
public function __construct(MyService $myService)
11901190
{
11911191
$this->myService = $myService;
11921192
}

Diff for: components/dependency_injection/factories.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ object::
3434

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

3939
.. configuration-block::
4040

Diff for: components/form/form_events.rst

+3-4
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,9 @@ View data Same as in ``FormEvents::POST_SET_DATA``
194194

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

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

202201
C) The ``FormEvents::POST_SUBMIT`` Event
203202
........................................

Diff for: cookbook/doctrine/registration_form.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Handling the Form Submission
198198
Next, you need a controller to handle the form. Start by creating a simple
199199
controller for displaying the registration form::
200200

201-
// src/AppBundle/Controller/AccountController.php
201+
// src/AppBundle/Controller/RegistrationController.php
202202
namespace AppBundle\Controller;
203203

204204
use Symfony\Bundle\FrameworkBundle\Controller\Controller;

0 commit comments

Comments
 (0)