Merge branch '2.3' into 2.7

fabpot · fabpot · commit c4cc147e8dc8 · 2016-01-07T14:28:07.000+01:00
* 2.3:
  Add missing apostrophe in setSaveHandler phpdoc
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -351,7 +351,7 @@ public function setOptions(array $options)
      * session.save_handler and session.save_path e.g.
      *
      *     ini_set('session.save_handler', 'files');
-     *     ini_set('session.save_path', /tmp');
+     *     ini_set('session.save_path', '/tmp');
      *
      * or pass in a NativeSessionHandler instance which configures session.save_handler in the
      * constructor, for a template see NativeFileSessionHandler or use handlers in

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public function setOptions(array $options)`
`351`	`351`	`* session.save_handler and session.save_path e.g.`
`352`	`352`	`*`
`353`	`353`	`* ini_set('session.save_handler', 'files');`
`354`		`- * ini_set('session.save_path', /tmp');`
	`354`	`+ * ini_set('session.save_path', '/tmp');`
`355`	`355`	`*`
`356`	`356`	`* or pass in a NativeSessionHandler instance which configures session.save_handler in the`
`357`	`357`	`* constructor, for a template see NativeFileSessionHandler or use handlers in`