Skip to content

Commit 1bc779b

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: [Security] Fix the namespace of a code example Update mercure.rst: Deleting forgotten(?) sentence
2 parents d33e724 + 2675832 commit 1bc779b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

mercure.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,6 @@ Debugging
684684

685685
The WebProfiler panel was introduced in MercureBundle 0.2.
686686

687-
Enable the panel in your configuration, as follows:
688-
689687
MercureBundle is shipped with a debug panel. Install the Debug pack to
690688
enable it::
691689

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,7 @@ You can log in a user programmatically using the ``login()`` method of the
17441744
:class:`Symfony\\Bundle\\SecurityBundle\\Security` helper::
17451745

17461746
// src/Controller/SecurityController.php
1747-
namespace App\Controller\SecurityController;
1747+
namespace App\Controller;
17481748

17491749
use App\Security\Authenticator\ExampleAuthenticator;
17501750
use Symfony\Bundle\SecurityBundle\Security;

0 commit comments

Comments
 (0)