Merge branch '5.x'

odan · odan · commit df95aeee04de · 2020-12-23T19:09:07.000+01:00
diff --git a/src/PhpSession.php b/src/PhpSession.php
@@ -135,7 +135,7 @@ public function destroy(): void
      */
     public function getId(): string
     {
-        return session_id() ?? '';
+        return (string)session_id();
     }
 
     /**
@@ -155,7 +155,7 @@ public function setId(string $id): void
      */
     public function getName(): string
     {
-        return session_name();
+        return (string)session_name();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function destroy(): void`
`135`	`135`	`*/`
`136`	`136`	`public function getId(): string`
`137`	`137`	`{`
`138`		`- return session_id() ?? '';`
	`138`	`+ return (string)session_id();`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`/**`
`@@ -155,7 +155,7 @@ public function setId(string $id): void`
`155`	`155`	`*/`
`156`	`156`	`public function getName(): string`
`157`	`157`	`{`
`158`		`- return session_name();`
	`158`	`+ return (string)session_name();`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`/**`