Merge branch '3.0'

* 3.0:
  [DI] Fix internal caching in AutowirePass
  [PropertyInfo] Remove useless return statement
  [Console] use ANSI escape sequences in ProgressBar overwrite method
  [HttpKernel] Fix wrong number of arguments in call of ExceptionListener::logException()
  Replace iconv_*() uses by mb_*(), add mbstring polyfill when required
  [DependencyInjection] Remove YAML check in CrossCheckTest
  [Process] Consistently use getProcess() in tests
  [LDAP] Free the search result after a search to free memory
  [DependencyInjection] fix phpDoc

Conflicts:
	src/Symfony/Component/Ldap/LdapClient.php

Author: nicolas-grekas

src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

@@ -95,8 +95,8 @@ private function normalizeParams(array $params)
             }
 
             // detect if the too long string must be shorten
-            if (self::MAX_STRING_LENGTH < iconv_strlen($params[$index], 'UTF-8')) {
-                $params[$index] = iconv_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
+            if (self::MAX_STRING_LENGTH < mb_strlen($params[$index], 'UTF-8')) {
+                $params[$index] = mb_substr($params[$index], 0, self::MAX_STRING_LENGTH - 6, 'UTF-8').' [...]';
                 continue;
             }
         }

src/Symfony/Bridge/Doctrine/composer.json

@@ -17,12 +17,13 @@
     ],
     "require": {
         "php": ">=5.5.9",
-        "doctrine/common": "~2.4"
+        "doctrine/common": "~2.4",
+        "symfony/polyfill-mbstring": "~1.0"
     },
     "require-dev": {
         "symfony/stopwatch": "~2.8|~3.0",
         "symfony/dependency-injection": "~2.8|~3.0",
-        "symfony/form": "~3.0,>3.0-BETA1",
+        "symfony/form": "~3.0",
         "symfony/http-kernel": "~2.8|~3.0",
         "symfony/property-access": "~2.8|~3.0",
         "symfony/property-info": "~2.8|3.0",

src/Symfony/Component/Console/Helper/ProgressBar.php

@@ -41,7 +41,6 @@ class ProgressBar
     private $startTime;
     private $stepWidth;
     private $percent = 0.0;
-    private $lastMessagesLength = 0;
     private $formatLineCount;
     private $messages;
     private $overwrite = true;
@@ -437,7 +436,7 @@ public function clear()
             $this->setRealFormat($this->internalFormat ?: $this->determineBestFormat());
         }
 
-        $this->overwrite(str_repeat("\n", $this->formatLineCount));
+        $this->overwrite('');
     }
 
     /**
@@ -477,37 +476,22 @@ private function setMaxSteps($max)
      */
     private function overwrite($message)
     {
-        $lines = explode("\n", $message);
-
-        // append whitespace to match the line's length
-        if (null !== $this->lastMessagesLength) {
-            foreach ($lines as $i => $line) {
-                if ($this->lastMessagesLength > Helper::strlenWithoutDecoration($this->output->getFormatter(), $line)) {
-                    $lines[$i] = str_pad($line, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT);
-                }
-            }
-        }
-
         if ($this->overwrite) {
-            // move back to the beginning of the progress bar before redrawing it
+            // Move the cursor to the beginning of the line
             $this->output->write("\x0D");
-        } elseif ($this->step > 0) {
-            // move to new line
-            $this->output->writeln('');
-        }
 
-        if ($this->formatLineCount) {
-            $this->output->write(sprintf("\033[%dA", $this->formatLineCount));
-        }
-        $this->output->write(implode("\n", $lines));
+            // Erase the line
+            $this->output->write("\x1B[2K");
 
-        $this->lastMessagesLength = 0;
-        foreach ($lines as $line) {
-            $len = Helper::strlenWithoutDecoration($this->output->getFormatter(), $line);
-            if ($len > $this->lastMessagesLength) {
-                $this->lastMessagesLength = $len;
+            // Erase previous lines
+            if ($this->formatLineCount > 0) {
+                $this->output->write(str_repeat("\x1B[1A\x1B[2K", $this->formatLineCount));
             }
+        } elseif ($this->step > 0) {
+            $this->output->writeln('');
         }
+
+        $this->output->write($message);
     }
 
     private function determineBestFormat()

src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php

@@ -233,7 +233,7 @@ public function testOverwriteWithShorterLine()
             $this->generateOutput('  0/50 [>---------------------------]   0%').
             $this->generateOutput('  0/50 [>---------------------------]   0%').
             $this->generateOutput('  1/50 [>---------------------------]   2%').
-            $this->generateOutput('  2/50 [=>--------------------------]     '),
+            $this->generateOutput('  2/50 [=>--------------------------]'),
             stream_get_contents($output->getStream())
         );
     }
@@ -353,7 +353,7 @@ public function testClear()
         $this->assertEquals(
             $this->generateOutput('  0/50 [>---------------------------]   0%').
             $this->generateOutput(' 25/50 [==============>-------------]  50%').
-            $this->generateOutput('                                          '),
+            $this->generateOutput(''),
             stream_get_contents($output->getStream())
         );
     }
@@ -551,9 +551,9 @@ public function testMultilineFormat()
         rewind($output->getStream());
         $this->assertEquals(
             $this->generateOutput(">---------------------------\nfoobar").
-            $this->generateOutput("=========>------------------\nfoobar                      ").
-            $this->generateOutput("                            \n                            ").
-            $this->generateOutput("============================\nfoobar                      "),
+            $this->generateOutput("=========>------------------\nfoobar").
+            "\x0D\x1B[2K\x1B[1A\x1B[2K".
+            $this->generateOutput("============================\nfoobar"),
             stream_get_contents($output->getStream())
         );
     }
@@ -659,6 +659,6 @@ protected function generateOutput($expected)
     {
         $count = substr_count($expected, "\n");
 
-        return "\x0D".($count ? sprintf("\033[%dA", $count) : '').$expected;
+        return "\x0D\x1B[2K".($count ? str_repeat("\x1B[1A\x1B[2K", $count) : '').$expected;
     }
 }

src/Symfony/Component/DependencyInjection/Alias.php

@@ -17,8 +17,6 @@ class Alias
     private $public;
 
     /**
-     * Constructor.
-     *
      * @param string $id     Alias identifier
      * @param bool   $public If this alias is public
      */

src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php

@@ -34,8 +34,6 @@ class AnalyzeServiceReferencesPass implements RepeatablePassInterface
     private $onlyConstructorArguments;
 
     /**
-     * Constructor.
-     *
      * @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
      */
     public function __construct($onlyConstructorArguments = false)

src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php

@@ -278,7 +278,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
      * @param string     $id
      * @param Definition $definition
      *
-     * @return \ReflectionClass|null
+     * @return \ReflectionClass|false
      */
     private function getReflectionClass($id, Definition $definition)
     {
@@ -288,16 +288,18 @@ private function getReflectionClass($id, Definition $definition)
 
         // Cannot use reflection if the class isn't set
         if (!$class = $definition->getClass()) {
-            return;
+            return false;
         }
 
         $class = $this->container->getParameterBag()->resolveValue($class);
 
         try {
-            return $this->reflectionClasses[$id] = new \ReflectionClass($class);
+            $reflector = new \ReflectionClass($class);
         } catch (\ReflectionException $reflectionException) {
-            // return null
+            $reflector = false;
         }
+
+        return $this->reflectionClasses[$id] = $reflector;
     }
 
     private function addServiceToAmbiguousType($id, $type)

src/Symfony/Component/DependencyInjection/Compiler/Compiler.php

@@ -25,9 +25,6 @@ class Compiler
     private $loggingFormatter;
     private $serviceReferenceGraph;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->passConfig = new PassConfig();

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -35,9 +35,6 @@ class PassConfig
     private $optimizationPasses;
     private $removingPasses;
 
-    /**
-     * Constructor.
-     */
     public function __construct()
     {
         $this->mergePass = new MergeExtensionConfigurationPass();

src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php

@@ -32,8 +32,6 @@ class RepeatedPass implements CompilerPassInterface
     private $passes;
 
     /**
-     * Constructor.
-     *
      * @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects
      *
      * @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface