Skip to content

Commit 0062c14

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: [Console] Fixes "Incorrectly nested style tag found" error when using multi-line header content Fix LDAP connection options [Security/Http] Ignore invalid URLs found in failure/success paths
2 parents 4de1c7d + 265d58a commit 0062c14

File tree

18 files changed

+138
-48
lines changed

18 files changed

+138
-48
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
----------------- ---------------------------------
99
Service ID .service_2
1010
Class Full\Qualified\Class2
11-
 Tags tag1 (attr1: val1, attr2: val2) 
12-
 tag1 (attr3: val3) 
13-
 tag2
11+
Tags tag1 (attr1: val1, attr2: val2)
12+
tag1 (attr3: val3)
13+
tag2
1414
Calls setMailer
1515
Public no
1616
Synthetic yes

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
----------------- ---------------------------------
44
Service ID -
55
Class Full\Qualified\Class2
6-
 Tags tag1 (attr1: val1, attr2: val2) 
7-
 tag1 (attr3: val3) 
8-
 tag2
6+
Tags tag1 (attr1: val1, attr2: val2)
7+
tag1 (attr3: val3)
8+
tag2
99
Calls setMailer
1010
Public no
1111
Synthetic yes

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
Autoconfigured no
1414
Factory Class Full\Qualified\FactoryClass
1515
Factory Method get
16-
 Arguments Service(.definition_2) 
17-
 %parameter% 
18-
 Inlined Service 
19-
 Array (3 element(s)) 
20-
 Iterator (2 element(s)) 
21-
 - Service(definition_1) 
22-
 - Service(.definition_2) 
23-
 Abstract argument (placeholder)
16+
Arguments Service(.definition_2)
17+
%parameter%
18+
Inlined Service
19+
Array (3 element(s))
20+
Iterator (2 element(s))
21+
- Service(definition_1)
22+
- Service(.definition_2)
23+
Abstract argument (placeholder)
2424
---------------- ---------------------------------
2525

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
----------------- ---------------------------------
44
Service ID -
55
Class Full\Qualified\Class2
6-
 Tags tag1 (attr1: val1, attr2: val2) 
7-
 tag1 (attr3: val3) 
8-
 tag2
6+
Tags tag1 (attr1: val1, attr2: val2)
7+
tag1 (attr3: val3)
8+
tag2
99
Calls setMailer
1010
Public no
1111
Synthetic yes

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
| Requirements | name: [a-z]+ |
1212
| Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
1313
| Defaults | name: Joseph |
14-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15-
| | opt1: val1 |
16-
| | opt2: val2 |
14+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15+
| | opt1: val1 |
16+
| | opt2: val2 |
1717
+--------------+-------------------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1_link.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
| Method | GET|HEAD |
1111
| Requirements | name: [a-z]+ |
1212
| Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
13-
| Defaults | _controller: ]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\ |
14-
| | name: Joseph |
15-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
16-
| | opt1: val1 |
17-
| | opt2: val2 |
13+
| Defaults | _controller: ]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\ |
14+
| | name: Joseph |
15+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
16+
| | opt1: val1 |
17+
| | opt2: val2 |
1818
+--------------+-----------------------------------------------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| Requirements | NO CUSTOM |
1212
| Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
1313
| Defaults | NONE |
14-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15-
| | opt1: val1 |
16-
| | opt2: val2 |
14+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15+
| | opt1: val1 |
16+
| | opt2: val2 |
1717
| Condition | context.getMethod() in ['GET', 'HEAD', 'POST'] |
1818
+--------------+-------------------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2_link.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
| Requirements | NO CUSTOM |
1212
| Class | Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\RouteStub |
1313
| Defaults | _controller: ]8;;myeditor://open?file=[:file:]&line=58\Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\MyController::__invoke()]8;;\ |
14-
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15-
| | opt1: val1 |
16-
| | opt2: val2 |
14+
| Options | compiler_class: Symfony\Component\Routing\RouteCompiler |
15+
| | opt1: val1 |
16+
| | opt2: val2 |
1717
| Condition | context.getMethod() in ['GET', 'HEAD', 'POST'] |
1818
+--------------+-----------------------------------------------------------------------------------------------+

‎src/Symfony/Bundle/FrameworkBundle/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"doctrine/persistence": "^1.3|^2|^3",
4040
"symfony/asset": "^5.3|^6.0",
4141
"symfony/browser-kit": "^5.4|^6.0",
42-
"symfony/console": "^5.4|^6.0",
42+
"symfony/console": "^5.4.9|^6.0.9",
4343
"symfony/css-selector": "^4.4|^5.0|^6.0",
4444
"symfony/dom-crawler": "^4.4.30|^5.3.7|^6.0",
4545
"symfony/dotenv": "^5.1|^6.0",

‎src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
->args([
122122
service('security.http_utils'),
123123
[], // Options
124+
service('logger')->nullOnInvalid(),
124125
])
125126

126127
->set('security.authentication.custom_failure_handler', CustomAuthenticationFailureHandler::class)

0 commit comments

Comments
 (0)