Merge branch '2.7' into 2.8

* 2.7:
  Add missing apostrophe in setSaveHandler phpdoc
  [VarDumper] Fix typo
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit

Author: fabpot

src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php

@@ -80,10 +80,14 @@ private static function getPhpUnitCliConfigArgument()
             if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
-            } elseif (strpos($testArg, '--configuration=') === 0) {
+            } elseif (0 === strpos($testArg, '--configuration=')) {
                 $argPath = substr($testArg, strlen('--configuration='));
                 $dir = realpath($argPath);
                 break;
+            } elseif (0 === strpos($testArg, '-c')) {
+                $argPath = substr($testArg, strlen('-c'));
+                $dir = realpath($argPath);
+                break;
             }
         }
 

src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

@@ -347,7 +347,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

src/Symfony/Component/VarDumper/Cloner/Data.php

@@ -53,7 +53,7 @@ public function withMaxDepth($maxDepth)
     }
 
     /**
-     * Limits the numbers of elements per depth level.
+     * Limits the number of elements per depth level.
      *
      * @param int $maxItemsPerDepth The max number of items dumped per depth level.
      *