Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit f41ba7944e3c · 2021-06-28T17:43:48.000+02:00
* 4.4:
  [FrameworkBundle] fix tests
diff --git a/Tests/Console/Descriptor/ObjectsProvider.php b/Tests/Console/Descriptor/ObjectsProvider.php
@@ -220,7 +220,7 @@ public static function getEventDispatchers()
     {
         $eventDispatcher = new EventDispatcher();
 
-        $eventDispatcher->addListener('event1', 'global_function', 255);
+        $eventDispatcher->addListener('event1', 'var_dump', 255);
         $eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);
         $eventDispatcher->addListener('event2', new CallableClass());
 
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json b/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json
@@ -1,7 +1,7 @@
 [
     {
         "type": "function",
-        "name": "global_function",
+        "name": "var_dump",
         "priority": 255
     },
     {
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md b/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md
@@ -3,7 +3,7 @@
 ## Listener 1
 
 - Type: `function`
-- Name: `global_function`
+- Name: `var_dump`
 - Priority: `255`
 
 ## Listener 2
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt b/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
@@ -2,10 +2,10 @@
 [33mRegistered Listeners for "event1" Event[39m
 [33m=======================================[39m
 
- ------- ------------------- ---------- 
- [32m Order [39m [32m Callable          [39m [32m Priority [39m 
- ------- ------------------- ---------- 
-  #1      global_function()   255       
-  #2      Closure()           -1        
- ------- ------------------- ---------- 
+ ------- ------------ ---------- 
+ [32m Order [39m [32m Callable   [39m [32m Priority [39m 
+ ------- ------------ ---------- 
+  #1      var_dump()   255       
+  #2      Closure()    -1        
+ ------- ------------ ---------- 
 
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml b/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event-dispatcher>
-  <callable type="function" name="global_function" priority="255"/>
+  <callable type="function" name="var_dump" priority="255"/>
   <callable type="closure" priority="-1"/>
 </event-dispatcher>
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json b/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json
@@ -2,7 +2,7 @@
     "event1": [
         {
             "type": "function",
-            "name": "global_function",
+            "name": "var_dump",
             "priority": 255
         },
         {
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md b/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md
@@ -5,7 +5,7 @@
 ### Listener 1
 
 - Type: `function`
-- Name: `global_function`
+- Name: `var_dump`
 - Priority: `255`
 
 ### Listener 2
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt b/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
@@ -5,12 +5,12 @@
 [33m"event1" event[39m
 [33m--------------[39m
 
- ------- ------------------- ---------- 
- [32m Order [39m [32m Callable          [39m [32m Priority [39m 
- ------- ------------------- ---------- 
-  #1      global_function()   255       
-  #2      Closure()           -1        
- ------- ------------------- ---------- 
+ ------- ------------ ---------- 
+ [32m Order [39m [32m Callable   [39m [32m Priority [39m 
+ ------- ------------ ---------- 
+  #1      var_dump()   255       
+  #2      Closure()    -1        
+ ------- ------------ ---------- 
 
 [33m"event2" event[39m
 [33m--------------[39m
diff --git a/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml b/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <event-dispatcher>
   <event name="event1">
-    <callable type="function" name="global_function" priority="255"/>
+    <callable type="function" name="var_dump" priority="255"/>
     <callable type="closure" priority="-1"/>
   </event>
   <event name="event2">

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public static function getEventDispatchers()`
`220`	`220`	`{`
`221`	`221`	`$eventDispatcher = new EventDispatcher();`
`222`	`222`
`223`		`- $eventDispatcher->addListener('event1', 'global_function', 255);`
	`223`	`+ $eventDispatcher->addListener('event1', 'var_dump', 255);`
`224`	`224`	`$eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);`
`225`	`225`	`$eventDispatcher->addListener('event2', new CallableClass());`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"type": "function",`
`4`		`- "name": "global_function",`
	`4`	`+ "name": "var_dump",`
`5`	`5`	`"priority": 255`
`6`	`6`	`},`
`7`	`7`	`{`
-Original file line number
+Diff line change
 [33mRegistered Listeners for "event1" Event[39m
 [33m=======================================[39m
 - ------- ------------------- ----------
 - [32m Order [39m [32m Callable          [39m [32m Priority [39m
 - ------- ------------------- ----------
 -  #1      global_function()   255
 -  #2      Closure()           -1
 - ------- ------------------- ----------
 + ------- ------------ ----------
 + [32m Order [39m [32m Callable   [39m [32m Priority [39m
 + ------- ------------ ----------
 +  #1      var_dump()   255
 +  #2      Closure()    -1
 + ------- ------------ ----------
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"event1": [`
`3`	`3`	`{`
`4`	`4`	`"type": "function",`
`5`		`- "name": "global_function",`
	`5`	`+ "name": "var_dump",`
`6`	`6`	`"priority": 255`
`7`	`7`	`},`
`8`	`8`	`{`