bug #32703 Ensure $request->hasSession() is always checked before calling getSession() (Arman-Hosseini)

nicolas-grekas · nicolas-grekas · commit bc864259eb75 · 2019-07-30T16:34:19.000+02:00
This PR was merged into the 4.4 branch.

Discussion
----------

Ensure $request-&gt;hasSession() is always checked before calling getSession()

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

7b2c326719 Ensure $request-&gt;hasSession() is always checked before calling getSession()
diff --git a/Templating/GlobalVariables.php b/Templating/GlobalVariables.php
@@ -75,9 +75,9 @@ public function getRequest()
      */
     public function getSession()
     {
-        if ($request = $this->getRequest()) {
-            return $request->getSession();
-        }
+        $request = $this->getRequest();
+
+        return $request && $request->hasSession() ? $request->getSession() : null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -75,9 +75,9 @@ public function getRequest()`
`75`	`75`	`*/`
`76`	`76`	`public function getSession()`
`77`	`77`	`{`
`78`		`- if ($request = $this->getRequest()) {`
`79`		`- return $request->getSession();`
`80`		`- }`
	`78`	`+ $request = $this->getRequest();`
	`79`	`+`
	`80`	`+ return $request && $request->hasSession() ? $request->getSession() : null;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`