Commitc77835c

committed

Merge branch '2.4'

Conflicts:cookbook/security/firewall_restriction.rst

2 parents1934720 +1172b7d commitc77835cCopy full SHA for c77835c

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -65,7 +65,7 @@ matches the configured ``pattern``.
`65`	`65`	`));`
`66`	`66`
`67`	`67`	The ``pattern`` is a regular expression. In this example, the firewall will only be
`68`		-activated if the URL starts (due to the ``^`` regex character) with ``/admin``. If
	`68`	+activated if the URL starts (due to the ``^`` regex character) with ``/admin``. If
`69`	`69`	`the URL does not match this pattern, the firewall will not be activated and subsequent`
`70`	`70`	`firewalls will have the opportunity to be matched for this request.`
`71`	`71`

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ the documentation on this constraint.`
`42`	`42`	\|\| - `allowPortraitMessage`_\|
`43`	`43`	\|\| - See:doc:`File</reference/constraints/File>` for inherited options\|
`44`	`44`	`+----------------+-----------------------------------------------------------------------+`
`45`		-\| Class\|:class:`Symfony\\Component\\Validator\\Constraints\\File`\|
	`45`	+\| Class\|:class:`Symfony\\Component\\Validator\\Constraints\\Image`\|
`46`	`46`	`+----------------+-----------------------------------------------------------------------+`
`47`		-\| Validator\|:class:`Symfony\\Component\\Validator\\Constraints\\FileValidator`\|
	`47`	+\| Validator\|:class:`Symfony\\Component\\Validator\\Constraints\\ImageValidator`\|
`48`	`48`	`+----------------+-----------------------------------------------------------------------+`
`49`	`49`
`50`	`50`	`Basic Usage`

Comments

(0)