8000 Bump minimal requirements · symfony/symfony@4b1dcc5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4b1dcc5

Browse files
jderussejderusse
committed
Bump minimal requirements
1 parent 2f2d1aa commit 4b1dcc5

File tree

10 files changed

+32
-18
lines changed

10 files changed

+32
-18
lines changed

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"symfony/proxy-manager-bridge": "~3.4|~4.0",
3636
"symfony/security-core": "~3.4|~4.0",
3737
"symfony/expression-language": "~3.4|~4.0",
38-
"symfony/validator": "~3.4|~4.0",
38+
"symfony/validator": "^3.4.31|^4.3.4",
3939
"symfony/translation": "~3.4|~4.0",
4040
"doctrine/annotations": "~1.0",
4141
"doctrine/cache": "~1.6",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"symfony/css-selector": "~3.4|~4.0",
3434
"symfony/dom-crawler": "~3.4|~4.0",
3535
"symfony/form": "~3.4|~4.0",
36-
"symfony/framework-bundle": "~4.2",
36+
"symfony/framework-bundle": "^4.3.4",
3737
"symfony/http-foundation": "~3.4|~4.0",
3838
"symfony/translation": "~3.4|~4.0",
3939
"symfony/twig-bundle": "~4.2",

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1288,8 +1288,8 @@ public function testNoClassFromGlobalNamespaceClassIdWithLeadingSlash()
12881288

12891289
public function testNoClassFromNamespaceClassIdWithLeadingSlash()
12901290
{
1291-
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
1292-
$this->expectExceptionMessage('The definition for "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class attribute, and appears to reference a class or interface. Please specify the class attribute explicitly or remove the leading backslash by renaming the service to "Symfony\Component\DependencyInjection\Tests\FooClass" to get rid of this error.');
1291+
$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
1292+
$this->expectExceptionMessage('Service definition "\Symfony\Component\DependencyInjection\Tests\FooClass" has no class, and its name looks like a FQCN but it starts with a backslash; remove the leading backslash.');
12931293
$container = new ContainerBuilder();
12941294

12951295
$container->register('\\'.FooClass::class);

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"psr/container": "^1.0",
21-
"symfony/service-contracts": "^1.1.2"
21+
"symfony/service-contracts": "^1.1.6"
2222
},
2323
"require-dev": {
2424
"symfony/yaml": "~3.4|~4.0",

‎src/Symfony/Component/Form/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"require-dev": {
2929
"doctrine/collections": "~1.0",
30-
"symfony/validator": "~3.4|~4.0",
30+
"symfony/validator": "^3.4.31|^4.3.4",
3131
"symfony/dependency-injection": "~3.4|~4.0",
3232
"symfony/config": "~3.4|~4.0",
3333
"symfony/console": "^4.3",

‎src/Symfony/Component/HttpClient/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"require": {
2222
"php": "^7.1.3",
2323
"psr/log": "^1.0",
24-
"symfony/http-client-contracts": "^1.1.4",
24+
"symfony/http-client-contracts": "^1.1.6",
2525
"symfony/polyfill-php73": "^1.11"
2626
},
2727
"require-dev": {

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/expression-language": "~3.4|~4.0",
2727
"symfony/http-foundation": "~3.4|~4.0",
2828
"symfony/ldap": "~3.4|~4.0",
29-
"symfony/validator": "~3.4|~4.0",
29+
"symfony/validator": "^3.4.31|^4.3.4",
3030
"psr/log": "~1.0"
3131
},
3232
"conflict": {

‎src/Symfony/Component/Security/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"symfony/polyfill-ctype": "~1.8",
3636
"symfony/polyfill-intl-icu": "~1.0",
3737
"symfony/routing": "~3.4|~4.0",
38-
"symfony/validator": "~3.4|~4.0",
38+
"symfony/validator": "^3.4.31|^4.3.4",
3939
"symfony/expression-language": "~3.4|~4.0",
4040
"symfony/ldap": "~3.4|~4.0",
4141
"psr/log": "~1.0"

‎src/Symfony/Component/Translation/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/polyfill-mbstring": "~1.0",
21-
"symfony/translation-contracts": "^1.1.2"
21+
"symfony/translation-contracts": "^1.1.6"
2222
},
2323
"require-dev": {
2424
"symfony/config": "~3.4|~4.0",

‎src/Symfony/Component/VarExporter/Tests/VarExporterTest.php

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,18 @@ public function provideFailingSerialization()
6464
};
6565

6666
yield [$a];
67+
}
6768

68-
$a = [null, $h];
69-
$a[0] = &$a;
69+
/**
70+
* This test is identical to testFailingSerialization, but the tested data causes a segfault in PHP 7.2
71+
* https://github.co 10000 m/sebastianbergmann/phpunit/issues/3790.
72+
*/
73+
public function testFailingSerializationCircularRef()
74+
{
75+
$value = [null, fopen(__FILE__, 'r')];
76+
$value[0] = &$value;
7077

71-
yield [$a];
78+
$this->testFailingSerialization($value);
7279
}
7380

7481
/**
@@ -157,11 +164,6 @@ public function provideExport()
157164

158165
yield ['hard-references', $value];
159166

160-
$value = [];
161-
$value[0] = &$value;
162-
163-
yield ['hard-references-recursive', $value];
164-
165167
static $value = [123];
166168

167169
yield ['external-references', [&$value], true];
@@ -205,6 +207,18 @@ public function provideExport()
205207

206208
yield ['php74-serializable', new Php74Serializable()];
207209
}
210+
211+
/**
212+
* This test is identical to testExport, but the tested data causes a segfault in PHP 7.2
213+
* https://github.com/sebastianbergmann/phpunit/issues/3790.
214+
*/
215+
public function testExportCircularRef()
216+
{
217+
$value = [];
218+
$value[0] = &$value;
219+
220+
$this->testExport('hard-references-recursive', $value);
221+
}
208222
}
209223

210224
class MySerializable implements \Serializable

0 commit comments

Comments
 (0)
0