Merge branch '4.2'

javiereguiluz · javiereguiluz · commit 008ab909bb40 · 2019-05-07T17:46:13.000+02:00
* 4.2:
  Fix local variable in session example
diff --git a/session.rst b/session.rst
@@ -146,13 +146,13 @@ controllers if you type-hint an argument with
         public function someMethod()
         {
             // stores an attribute in the session for later reuse
-            $session->set('attribute-name', 'attribute-value');
+            $this->session->set('attribute-name', 'attribute-value');
 
             // gets an attribute by name
-            $foo = $session->get('foo');
+            $foo = $this->session->get('foo');
 
             // the second argument is the value returned when the attribute doesn't exist
-            $filters = $session->get('filters', []);
+            $filters = $this->session->get('filters', []);
 
             // ...
         }

Original file line number	Diff line number	Diff line change
`@@ -146,13 +146,13 @@ controllers if you type-hint an argument with`
`146`	`146`	`public function someMethod()`
`147`	`147`	`{`
`148`	`148`	`// stores an attribute in the session for later reuse`
`149`		`- $session->set('attribute-name', 'attribute-value');`
	`149`	`+ $this->session->set('attribute-name', 'attribute-value');`
`150`	`150`
`151`	`151`	`// gets an attribute by name`
`152`		`- $foo = $session->get('foo');`
	`152`	`+ $foo = $this->session->get('foo');`
`153`	`153`
`154`	`154`	`// the second argument is the value returned when the attribute doesn't exist`
`155`		`- $filters = $session->get('filters', []);`
	`155`	`+ $filters = $this->session->get('filters', []);`
`156`	`156`
`157`	`157`	`// ...`
`158`	`158`	`}`