Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 92d0f2e6f500 · 2017-11-16T18:23:39.000+02:00
* 3.4:
  fix deps=low
diff --git a/Csrf/CsrfToken.php b/Csrf/CsrfToken.php
@@ -21,10 +21,10 @@ class CsrfToken
     private $id;
     private $value;
 
-    public function __construct(string $id, string $value)
+    public function __construct(string $id, ?string $value)
     {
         $this->id = $id;
-        $this->value = $value;
+        $this->value = $value ?? '';
     }
 
     /**
diff --git a/Csrf/composer.json b/Csrf/composer.json
@@ -20,7 +20,10 @@
         "symfony/security-core": "~3.4|~4.0"
     },
     "require-dev": {
-        "symfony/http-foundation": "~3.4|~4.0"
+        "symfony/http-foundation": "~3.4-beta5|~4.0-beta5"
+    },
+    "conflict": {
+        "symfony/http-foundation": "<3.4-beta5|~4.0,<4.0-beta5"
     },
     "suggest": {
         "symfony/http-foundation": "For using the class SessionTokenStorage."
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": "^7.1.3",
         "symfony/event-dispatcher": "~3.4|~4.0",
-        "symfony/http-foundation": "~3.4|~4.0",
+        "symfony/http-foundation": "~3.4-beta5|~4.0-beta5",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/property-access": "~3.4|~4.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ class CsrfToken`
`21`	`21`	`private $id;`
`22`	`22`	`private $value;`
`23`	`23`
`24`		`- public function __construct(string $id, string $value)`
	`24`	`+ public function __construct(string $id, ?string $value)`
`25`	`25`	`{`
`26`	`26`	`$this->id = $id;`
`27`		`- $this->value = $value;`
	`27`	`+ $this->value = $value ?? '';`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`