Merge pull request #24 from artursvonda/support-symfony-5.0-cookies

stof · web-flow · commit 7abcb4243ed8 · 2018-11-30T22:39:30.000+01:00
Fix legacy cookie defaults deprecations
diff --git a/http-kernel-fixtures/cookie_page1.php b/http-kernel-fixtures/cookie_page1.php
@@ -1,6 +1,10 @@
 <?php
     $resp = new Symfony\Component\HttpFoundation\Response();
-    $cook = new Symfony\Component\HttpFoundation\Cookie('srvr_cookie', 'srv_var_is_set', 0, '/');
+    if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {
+        $cook = Symfony\Component\HttpFoundation\Cookie::create('srvr_cookie', 'srv_var_is_set', 0, '/');
+    } else {
+        $cook = new Symfony\Component\HttpFoundation\Cookie('srvr_cookie', 'srv_var_is_set', 0, '/');
+    }
     $resp->headers->setCookie($cook);
 ?>
 <!doctype html public "-//w3c//dtd xhtml 1.1//en" "http://www.w3.org/tr/xhtml11/dtd/xhtml11.dtd">
diff --git a/http-kernel-fixtures/cookie_page3.php b/http-kernel-fixtures/cookie_page3.php
@@ -2,7 +2,11 @@
 
 $hasCookie = $request->cookies->has('foo');
 $resp = new Symfony\Component\HttpFoundation\Response();
-$cook = new Symfony\Component\HttpFoundation\Cookie('foo', 'bar');
+if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {
+    $cook = Symfony\Component\HttpFoundation\Cookie::create('foo', 'bar');
+} else {
+    $cook = new Symfony\Component\HttpFoundation\Cookie('foo', 'bar');
+}
 $resp->headers->setCookie($cook);
 
 ?>
diff --git a/http-kernel-fixtures/issue140.php b/http-kernel-fixtures/issue140.php
@@ -7,7 +7,11 @@
 <?php
 if ($request->isMethod('POST')) {
     $resp = new Symfony\Component\HttpFoundation\Response();
-    $cook = new Symfony\Component\HttpFoundation\Cookie('tc', $request->request->get('cookie_value'));
+    if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {
+        $cook = Symfony\Component\HttpFoundation\Cookie::create('tc', $request->request->get('cookie_value'));
+    } else {
+        $cook = new Symfony\Component\HttpFoundation\Cookie('tc', $request->request->get('cookie_value'));
+    }
     $resp->headers->setCookie($cook);
 } elseif ($request->query->has('show_value')) {
     echo html_escape_value($request->cookies->get('tc'));
diff --git a/http-kernel-fixtures/sub-folder/cookie_page1.php b/http-kernel-fixtures/sub-folder/cookie_page1.php
@@ -1,7 +1,11 @@
 <?php
     $requestUri = $request->server->get('REQUEST_URI');
     $resp = new Symfony\Component\HttpFoundation\Response();
-    $cook = new Symfony\Component\HttpFoundation\Cookie('srvr_cookie', 'srv_var_is_set_sub_folder', 0, dirname($requestUri));
+    if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {
+        $cook = Symfony\Component\HttpFoundation\Cookie::create('srvr_cookie', 'srv_var_is_set_sub_folder', 0, dirname($requestUri));
+    } else {
+        $cook = new Symfony\Component\HttpFoundation\Cookie('srvr_cookie', 'srv_var_is_set_sub_folder', 0, dirname($requestUri));
+    }
     $resp->headers->setCookie($cook);
 ?>
 <!doctype html public "-//w3c//dtd xhtml 1.1//en" "http://www.w3.org/tr/xhtml11/dtd/xhtml11.dtd">
diff --git a/src/FixturesKernel.php b/src/FixturesKernel.php
@@ -74,7 +74,13 @@ private function saveSession(Request $request, Response $response)
 
             $params = session_get_cookie_params();
 
-            $response->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
+            if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {
+                $cookie = Cookie::create($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+            } else {
+                $cookie = new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']);
+            }
+
+            $response->headers->setCookie($cookie);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,13 @@ private function saveSession(Request $request, Response $response)`
`74`	`74`
`75`	`75`	`$params = session_get_cookie_params();`
`76`	`76`
`77`		`- $response->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));`
	`77`	`+ if (method_exists('Symfony\Component\HttpFoundation\Cookie', 'create')) {`
	`78`	`+ $cookie = Cookie::create($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']);`
	`79`	`+ } else {`
	`80`	`+ $cookie = new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']);`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ $response->headers->setCookie($cookie);`
`78`	`84`	`}`
`79`	`85`	`}`
`80`	`86`	`}`