Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e39cb50

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.3
* 4.4: [Process] Avoid calling fclose on an already closed resource [GHA] test tty group [DI] Fix tests on PHP 7.1
2 parents 88d6cfa + 859d4a1 commit e39cb50
Copy full SHA for e39cb50

File tree

Expand file treeCollapse file tree

7 files changed

+62
-4
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+62
-4
lines changed

‎.github/workflows/unit-tests.yml

Copy file name to clipboardExpand all lines: .github/workflows/unit-tests.yml
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ jobs:
212212
213213
[[ ! $X ]] || (exit 1)
214214
215+
- name: Run TTY tests
216+
if: "! matrix.mode"
217+
run: |
218+
script -e -c './phpunit --group tty' /dev/null
219+
215220
- name: Run tests with SIGCHLD enabled PHP
216221
if: "matrix.php == '7.2' && ! matrix.mode"
217222
run: |

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.expected.yml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ services:
1515
- t: { a: b }
1616
autowire: true
1717
autoconfigure: true
18-
arguments: ['@bar', !tagged_iterator foo, !service { class: Baz }]
18+
arguments: ['@bar', !tagged_iterator foo]
1919
bar:
2020
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
2121
public: true
2222
tags:
2323
- t: { a: b }
2424
autowire: true
25-
arguments: [null, !tagged_iterator foo, !service { class: Baz }]
25+
arguments: [null, !tagged_iterator foo]
2626
calls:
2727
- [setFoo, ['@bar']]
2828

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/defaults.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
->tag('t', ['a' => 'b'])
1616
->bind(Foo::class, service('bar'))
1717
->bind('iterable $foo', tagged_iterator('foo'))
18-
->bind('object $baz', inline_service('Baz'))
1918
->public();
2019

2120
$s->set(Foo::class)->args([service('bar')])->public();

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_binding.expected.yml

Copy file name to clipboard
+28Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
services:
3+
service_container:
4+
class: Symfony\Component\DependencyInjection\ContainerInterface
5+
public: true
6+
synthetic: true
7+
App\BarService:
8+
class: App\BarService
9+
public: true
10+
arguments: [!service { class: FooClass }]
11+
Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
12+
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
13+
public: true
14+
tags:
15+
- { name: t, a: b }
16+
autowire: true
17+
autoconfigure: true
18+
arguments: ['@bar', !tagged_iterator foo, !service { class: Baz }]
19+
bar:
20+
class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
21+
public: true
22+
tags:
23+
- { name: t, a: b }
24+
autowire: true
25+
arguments: [null, !tagged_iterator foo, !service { class: Baz }]
26+
calls:
27+
- [setFoo, ['@bar']]
28+

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/inline_binding.php

Copy file name to clipboard
+23Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
4+
5+
use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo;
6+
7+
return function (ContainerConfigurator $c) {
8+
$c->import('basic.php');
9+
10+
$s = $c->services()->defaults()
11+
->public()
12+
->private()
13+
->autoconfigure()
14+
->autowire()
15+
->tag('t', ['a' => 'b'])
16+
->bind(Foo::class, ref('bar'))
17+
->bind('iterable $foo', tagged_iterator('foo'))
18+
->bind('object $baz', inline_service('Baz'))
19+
->public();
20+
21+
$s->set(Foo::class)->args([ref('bar')])->public();
22+
$s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
23+
};

‎src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public function provideConfig()
8686
yield ['php7'];
8787
yield ['anonymous'];
8888
yield ['lazy_fqcn'];
89+
yield ['inline_binding'];
8990
yield ['remove'];
9091
yield ['config_builder'];
9192
}

‎src/Symfony/Component/Process/Pipes/AbstractPipes.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/Pipes/AbstractPipes.php
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ public function __construct($input)
4747
public function close()
4848
{
4949
foreach ($this->pipes as $pipe) {
50-
fclose($pipe);
50+
if (\is_resource($pipe)) {
51+
fclose($pipe);
52+
}
5153
}
5254
$this->pipes = [];
5355
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.