Merge branch '4.1'

* 4.1:
  [Finder] fixed root directory access for ftp/sftp wrapper
  [Console] Fix clearing sections containing questions
  [FrameworkBundle] dont suggest hidden services in debug:container and debug:autow commands
  [FWBundle] Throw if PropertyInfo is enabled, but the component isn't installed
  Remove redundant path check

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php

@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } elseif ($tag = $input->getOption('tag')) {
             $options = array('tag' => $tag);
         } elseif ($name = $input->getArgument('name')) {
-            $name = $this->findProperServiceName($input, $errorIo, $object, $name);
+            $name = $this->findProperServiceName($input, $errorIo, $object, $name, $input->getOption('show-hidden'));
             $options = array('id' => $name);
         } else {
             $options = array();
@@ -218,13 +218,13 @@ protected function getContainerBuilder()
         return $this->containerBuilder = $container;
     }
 
-    private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, $name)
+    private function findProperServiceName(InputInterface $input, SymfonyStyle $io, ContainerBuilder $builder, string $name, bool $showHidden)
     {
         if ($builder->has($name) || !$input->isInteractive()) {
             return $name;
         }
 
-        $matchingServices = $this->findServiceIdsContaining($builder, $name);
+        $matchingServices = $this->findServiceIdsContaining($builder, $name, $showHidden);
         if (empty($matchingServices)) {
             throw new InvalidArgumentException(sprintf('No services found that match "%s".', $name));
         }
@@ -236,11 +236,14 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
         return $io->choice('Select one of the following services to display its information', $matchingServices);
     }
 
-    private function findServiceIdsContaining(ContainerBuilder $builder, $name)
+    private function findServiceIdsContaining(ContainerBuilder $builder, string $name, bool $showHidden)
     {
         $serviceIds = $builder->getServiceIds();
         $foundServiceIds = $foundServiceIdsIgnoringBackslashes = array();
         foreach ($serviceIds as $serviceId) {
+            if (!$showHidden && 0 === strpos($serviceId, '.')) {
+                continue;
+            }
             if (false !== stripos(str_replace('\\', '', $serviceId), $name)) {
                 $foundServiceIdsIgnoringBackslashes[] = $serviceId;
             }

src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php

@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($search = $input->getArgument('search')) {
             $serviceIds = array_filter($serviceIds, function ($serviceId) use ($search) {
-                return false !== stripos(str_replace('\\', '', $serviceId), $search);
+                return false !== stripos(str_replace('\\', '', $serviceId), $search) && 0 !== strpos($serviceId, '.');
             });
 
             if (empty($serviceIds)) {

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -75,6 +75,7 @@
 use Symfony\Component\PropertyInfo\PropertyAccessExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyDescriptionExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyInitializableExtractorInterface;
+use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyListExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
@@ -272,7 +273,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->isConfigEnabled($container, $config['property_info'])) {
-            $this->registerPropertyInfoConfiguration($config['property_info'], $container, $loader);
+            $this->registerPropertyInfoConfiguration($container, $loader);
         }
 
         if ($this->isConfigEnabled($container, $config['lock'])) {
@@ -1374,8 +1375,12 @@ private function registerSerializerConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerPropertyInfoConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function registerPropertyInfoConfiguration(ContainerBuilder $container, XmlFileLoader $loader)
     {
+        if (!interface_exists(PropertyInfoExtractorInterface::class)) {
+            throw new LogicException('PropertyInfo support cannot be enabled as the PropertyInfo component is not installed. Try running "composer require symfony/property-info".');
+        }
+
         $loader->load('property_info.xml');
 
         if (interface_exists('phpDocumentor\Reflection\DocBlockFactoryInterface')) {

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

@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
@@ -123,6 +124,10 @@ private function doAsk(OutputInterface $output, Question $question)
             $ret = trim($this->autocomplete($output, $question, $inputStream, \is_array($autocomplete) ? $autocomplete : iterator_to_array($autocomplete, false)));
         }
 
+        if ($output instanceof ConsoleSectionOutput) {
+            $output->addContent($ret);
+        }
+
         $ret = \strlen($ret) > 0 ? $ret : $question->getDefault();
 
         if ($normalizer = $question->getNormalizer()) {

src/Symfony/Component/Console/Output/ConsoleSectionOutput.php

@@ -77,6 +77,18 @@ public function getContent(): string
         return implode('', $this->content);
     }
 
+    /**
+     * @internal
+     */
+    public function addContent(string $input)
+    {
+        foreach (explode(PHP_EOL, $input) as $lineContent) {
+            $this->lines += ceil($this->getDisplayLength($lineContent) / $this->terminal->getWidth()) ?: 1;
+            $this->content[] = $lineContent;
+            $this->content[] = PHP_EOL;
+        }
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -88,11 +100,7 @@ protected function doWrite($message, $newline)
 
         $erasedContent = $this->popStreamContentUntilCurrentSection();
 
-        foreach (explode(PHP_EOL, $message) as $lineContent) {
-            $this->lines += ceil($this->getDisplayLength($lineContent) / $this->terminal->getWidth()) ?: 1;
-            $this->content[] = $lineContent;
-            $this->content[] = PHP_EOL;
-        }
+        $this->addContent($message);
 
         parent::doWrite($message, true);
         parent::doWrite($erasedContent, false);

src/Symfony/Component/Console/Tests/Output/ConsoleSectionOutputTest.php

@@ -13,17 +13,20 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Formatter\OutputFormatter;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\StreamableInputInterface;
 use Symfony\Component\Console\Output\ConsoleSectionOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
+use Symfony\Component\Console\Question\Question;
 
 class ConsoleSectionOutputTest extends TestCase
 {
     private $stream;
 
     protected function setUp()
     {
-        $this->stream = fopen('php://memory', 'r+', false);
+        $this->stream = fopen('php://memory', 'r+b', false);
     }
 
     protected function tearDown()
@@ -137,4 +140,24 @@ public function testMultipleSectionsOutput()
         rewind($output->getStream());
         $this->assertEquals('Foo'.PHP_EOL.'Bar'.PHP_EOL."\x1b[2A\x1b[0JBar".PHP_EOL."\x1b[1A\x1b[0JBaz".PHP_EOL.'Bar'.PHP_EOL."\x1b[1A\x1b[0JFoobar".PHP_EOL, stream_get_contents($output->getStream()));
     }
+
+    public function testClearSectionContainingQuestion()
+    {
+        $inputStream = fopen('php://memory', 'r+b', false);
+        fwrite($inputStream, "Batman & Robin\n");
+        rewind($inputStream);
+
+        $input = $this->getMockBuilder(StreamableInputInterface::class)->getMock();
+        $input->expects($this->once())->method('isInteractive')->willReturn(true);
+        $input->expects($this->once())->method('getStream')->willReturn($inputStream);
+
+        $sections = array();
+        $output = new ConsoleSectionOutput($this->stream, $sections, OutputInterface::VERBOSITY_NORMAL, true, new OutputFormatter());
+
+        (new QuestionHelper())->ask($input, $output, new Question('What\'s your favorite super hero?'));
+        $output->clear();
+
+        rewind($output->getStream());
+        $this->assertSame('What\'s your favorite super hero?'.PHP_EOL."\x1b[2A\x1b[0J", stream_get_contents($output->getStream()));
+    }
 }

src/Symfony/Component/Finder/Finder.php

@@ -748,12 +748,20 @@ private function searchInDirectory(string $dir): \Iterator
     /**
      * Normalizes given directory names by removing trailing slashes.
      *
+     * Excluding: (s)ftp:// wrapper
+     *
      * @param string $dir
      *
      * @return string
      */
     private function normalizeDir($dir)
     {
-        return rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+        $dir = rtrim($dir, '/'.\DIRECTORY_SEPARATOR);
+
+        if (preg_match('#^s?ftp://#', $dir)) {
+            $dir .= '/';
+        }
+
+        return $dir;
     }
 }

src/Symfony/Component/HttpFoundation/Request.php

@@ -1066,7 +1066,7 @@ public function getRelativeUriForPath($path)
         }
 
         $sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
-        $targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
+        $targetDirs = explode('/', substr($path, 1));
         array_pop($sourceDirs);
         $targetFile = array_pop($targetDirs);