8000 minor #41885 [FrameworkBundle] fix tests (nicolas-grekas) · symfony/symfony@41e88c9 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 41e88c9

Browse files
nicolas-grekasnicolas-grekas
committed
minor #41885 [FrameworkBundle] fix tests (nicolas-grekas)
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] fix tests | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Needed to make #41884 green. Commits ------- 21621ab [FrameworkBundle] fix tests
2 parents ac2c3a9 + 21621ab commit 41e88c9

File tree

11 files changed

+26
-21
lines changed

11 files changed

+26
-21
lines changed

‎.github/workflows/unit-tests.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,12 @@ jobs:
198198
git checkout -m FETCH_HEAD
199199
COMPONENTS=$(echo "$COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true)
200200
(cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb)
201-
[[ ! $COMPONENTS ]] || echo "$COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1
201+
if [[ $COMPONENTS ]]; then
202+
echo "::group::install phpunit"
203+
./phpunit install
204+
echo "::endgroup::"
205+
echo "$COMPONENTS" | parallel -j +3 "_run_tests {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1
206+
fi
202207
fi
203208
204209
[[ ! $X ]] || (exit 1)

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public static function getEventDispatchers()
200200
{
201201
$eventDispatcher = new EventDispatcher();
202202

203-
$eventDispatcher->addListener('event1', 'global_function', 255);
203+
$eventDispatcher->addListener('event1', 'var_dump', 255);
204204
$eventDispatcher->addListener('event1', function () { return 'Closure'; }, -1);
205205
$eventDispatcher->addListener('event2', new CallableClass());
206206

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"type": "function",
4-
"name": "global_function",
4+
"name": "var_dump",
55
"priority": 255
66
},
77
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.md

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

55
- Type: `function`
6-
- Name: `global_function`
6+
- Name: `var_dump`
77
- Priority: `255`
88

99
## Listener 2

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
Registered Listeners for "event1" Event
33
=======================================
44

5-
------- ------------------- ----------
6-
 Order   Callable   Priority 
7-
------- ------------------- ----------
8-
#1 global_function() 255
9-
#2 Closure() -1
10-
------- ------------------- ----------
5+
------- ------------ ----------
6+
 Order   Callable   Priority 
7+
------- ------------ ----------
8+
#1 var_dump() 255
9+
#2 Closure() -1
10+
------- ------------ ----------
1111

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<event-dispatcher>
3-
<callable type="function" name="global_function" priority="255"/>
3+
<callable type="function" name="var_dump" priority="255"/>
44
<callable type="closure" priority="-1"/>
55
</event-dispatcher>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"event1": [
33
{
44
"type": "function",
5-
"name": "global_function",
5+
"name": "var_dump",
66
"priority": 255
77
},
88
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
### Listener 1
66

77
- Type: `function`
8-
- Name: `global_function`
8+
- Name: `var_dump`
99
- Priority: `255`
1010

1111
### Listener 2

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"event1" event
66
--------------
77

8-
------- ------------------- ----------
9-
 Order   Callable   Priority 
10-
------- ------------------- ----------
11-
#1 global_function() 255
12-
#2 Closure() -1
13-
------- ------------------- ----------
8+
------- ------------ ----------
9+
 Order   Callable   Priority 
10+
------- ------------ ----------
11+
#1 var_dump() 255
12+
#2 Closure() -1
13+
------- ------------ ----------
1414

1515
"event2" event
1616
--------------

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<event-dispatcher>
33
<event name="event1">
4-
<callable type="function" name="global_function" priority="255"/>
4+
<callable type="function" name="var_dump" priority="255"/>
55
<callable type="closure" priority="-1"/>
66
</event>
77
<event name="event2">

‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<argument type="service" id="twig" />
167167
<argument type="service" id="twig.error_renderer.html.inner" />
168168
<argument type="service">
169-
<service>
169+
<service class="bool">
170170
<factory class="Symfony\Bridge\Twig\ErrorRenderer\TwigErrorRenderer" method="isDebug" />
171171
<argument type="service" id="request_stack" />
172172
<argument>%kernel.debug%</argument>

0 commit comments

Comments
 (0)
0