Skip to content

Commit 9b198b2

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: [FrameworkBundle] Fix fixtures [HttpKernel] Inline ValidateRequestListener logic into HttpKernel fixed HttpKernel dependencies after #18688 Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpKernel/composer.json
2 parents 04530dd + 1fc59e8 commit 9b198b2

13 files changed

+13
-17
lines changed

‎Resources/config/web.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,5 @@
3838
<argument type="service" id="request_stack" />
3939
<tag name="kernel.event_subscriber" />
4040
</service>
41-
42-
<service id="validate_request_listener" class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">
43-
<tag name="kernel.event_subscriber" />
44-
</service>
4541
</services>
4642
</container>

‎Tests/Fixtures/Descriptor/array_parameter.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--------------------- -----------------------------------------------------------------
2-
Parameter Value
2+
 Parameter   Value 
33
--------------------- -----------------------------------------------------------------
44
twig.form.resources ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
55
--------------------- -----------------------------------------------------------------

‎Tests/Fixtures/Descriptor/builder_1_public.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
=================================
44

55
------------------- --------------------------------------------------------
6-
Service ID Class name
6+
 Service ID   Class name 
77
------------------- --------------------------------------------------------
88
alias_1 alias for "service_1"
99
alias_2 alias for "service_2"

‎Tests/Fixtures/Descriptor/builder_1_services.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
=============================================
44

55
------------------- --------------------------------------------------------
6-
Service ID Class name
6+
 Service ID   Class name 
77
------------------- --------------------------------------------------------
88
alias_1 alias for "service_1"
99
alias_2 alias for "service_2"

‎Tests/Fixtures/Descriptor/builder_1_tag1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
====================================================================
44

55
-------------- ------- ------- ------- -----------------------
6-
Service ID attr1 attr2 attr3 Class name
6+
 Service ID   attr1   attr2   attr3   Class name 
77
-------------- ------- ------- ------- -----------------------
88
definition_2 val1 val2 Full\Qualified\Class2
99
" val3

‎Tests/Fixtures/Descriptor/definition_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
------------------ -----------------------------
2-
Option Value
2+
 Option   Value 
33
------------------ -----------------------------
44
Service ID -
55
Class Full\Qualified\Class1

‎Tests/Fixtures/Descriptor/definition_2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
------------------ -------------------------------------------------------
2-
Option Value
2+
 Option   Value 
33
------------------ -------------------------------------------------------
44
Service ID -
55
Class Full\Qualified\Class2

‎Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
=======================================
44

55
------- ------------------- ----------
6-
Order Callable Priority
6+
 Order   Callable   Priority 
77
------- ------------------- ----------
88
#1 global_function() 255
99
#2 \Closure() -1

‎Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
--------------
77

88
------- ------------------- ----------
9-
Order Callable Priority
9+
 Order   Callable   Priority 
1010
------- ------------------- ----------
1111
#1 global_function() 255
1212
#2 \Closure() -1
@@ -16,7 +16,7 @@
1616
--------------
1717

1818
------- ----------------------------------------------------------------------------------- ----------
19-
Order Callable Priority
19+
 Order   Callable   Priority 
2020
------- ----------------------------------------------------------------------------------- ----------
2121
#1 Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() 0
2222
------- ----------------------------------------------------------------------------------- ----------

‎Tests/Fixtures/Descriptor/parameter.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--------------- ---------
2-
Parameter Value
2+
 Parameter   Value 
33
--------------- ---------
44
database_name symfony
55
--------------- ---------

‎Tests/Fixtures/Descriptor/parameters_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
============================
44

55
----------- --------------------------
6-
Parameter Value
6+
 Parameter   Value 
77
----------- --------------------------
88
array [12,"Hello world!",true]
99
boolean true

‎Tests/Fixtures/Descriptor/route_collection_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--------- ---------- ------------ ----------- ---------------
2-
Name Method Scheme Host Path
2+
 Name   Method   Scheme   Host   Path 
33
--------- ---------- ------------ ----------- ---------------
44
route_1 GET|HEAD http|https localhost /hello/{name}
55
route_2 PUT|POST http|https localhost /name/add

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"require-dev": {
4040
"symfony/browser-kit": "~2.8|~3.0",
41-
"symfony/console": "~2.8|~3.0",
41+
"symfony/console": "~2.8.8|~3.0.8|~3.1.2|~3.2",
4242
"symfony/css-selector": "~2.8|~3.0",
4343
"symfony/dom-crawler": "~2.8|~3.0",
4444
"symfony/polyfill-intl-icu": "~1.0",

0 commit comments

Comments
 (0)