Skip to content

Commit d97c177

Browse files
Merge branch '3.4'
* 3.4: fix deps=low
2 parents 595a5b9 + c5595a1 commit d97c177

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

src/Symfony/Bundle/SecurityBundle/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
"ext-xml": "*",
21-
"symfony/security": "~3.4|~4.0",
21+
"symfony/security": "~3.4-beta5|~4.0-beta5",
2222
"symfony/dependency-injection": "~3.4|~4.0",
2323
"symfony/http-kernel": "~3.4|~4.0"
2424
},

src/Symfony/Component/Security/Csrf/CsrfToken.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ class CsrfToken
2121
private $id;
2222
private $value;
2323

24-
public function __construct(string $id, string $value)
24+
public function __construct(string $id, ?string $value)
2525
{
2626
$this->id = $id;
27-
$this->value = $value;
27+
$this->value = $value ?? '';
2828
}
2929

3030
/**

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
"symfony/security-core": "~3.4|~4.0"
2121
},
2222
"require-dev": {
23-
"symfony/http-foundation": "~3.4|~4.0"
23+
"symfony/http-foundation": "~3.4-beta5|~4.0-beta5"
24+
},
25+
"conflict": {
26+
"symfony/http-foundation": "<3.4-beta5|~4.0,<4.0-beta5"
2427
},
2528
"suggest": {
2629
"symfony/http-foundation": "For using the class SessionTokenStorage."

src/Symfony/Component/Security/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/event-dispatcher": "~3.4|~4.0",
21-
"symfony/http-foundation": "~3.4|~4.0",
21+
"symfony/http-foundation": "~3.4-beta5|~4.0-beta5",
2222
"symfony/http-kernel": "~3.4|~4.0",
2323
"symfony/property-access": "~3.4|~4.0"
2424
},

0 commit comments

Comments
 (0)