Merge branch '2.5'

* 2.5:
  fixed previous merge
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Yaml] fix overwriting of keys after merged map
  [Yaml] fix priority of sequence merges according to spec
  [Console] Fixed notice in QuestionHelper
  [Console] Fixed notice in DialogHelper
  [Yaml] refactoring of merges for performance
  [Console] remove weird use statement
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  [FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Yaml/Parser.php

Author: fabpot

Helper/DialogHelper.php

@@ -157,7 +157,7 @@ public function ask(OutputInterface $output, $question, $default = null, array $
                     $c .= fread($inputStream, 2);
 
                     // A = Up Arrow. B = Down Arrow
-                    if ('A' === $c[2] || 'B' === $c[2]) {
+                    if (isset($c[2]) && ('A' === $c[2] || 'B' === $c[2])) {
                         if ('A' === $c[2] && -1 === $ofs) {
                             $ofs = 0;
                         }

Helper/QuestionHelper.php

@@ -212,7 +212,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
                 $c .= fread($inputStream, 2);
 
                 // A = Up Arrow. B = Down Arrow
-                if ('A' === $c[2] || 'B' === $c[2]) {
+                if (isset($c[2]) && ('A' === $c[2] || 'B' === $c[2])) {
                     if ('A' === $c[2] && -1 === $ofs) {
                         $ofs = 0;
                     }

Question/Question.php

@@ -10,7 +10,6 @@
  */
 
 namespace Symfony\Component\Console\Question;
-use Doctrine\Common\Proxy\Exception\InvalidArgumentException;
 
 /**
  * Represents a Question.
@@ -184,7 +183,7 @@ public function getValidator()
      *
      * @return Question The current instance
      *
-     * @throws InvalidArgumentException In case the number of attempts is invalid.
+     * @throws \InvalidArgumentException In case the number of attempts is invalid.
      */
     public function setMaxAttempts($attempts)
     {