Upgrade 1-11.38

vendor/symfony/console/Tests/Helper/SymfonyQuestionHelperTest.php

@@ -122,57 +122,16 @@ class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
         $this->assertOutputContains('Question with a trailing \\', $output);
     }
 
+    /**
+     * @expectedException        \Symfony\Component\Console\Exception\RuntimeException
+     * @expectedExceptionMessage Aborted.
+     */
     public function testAskThrowsExceptionOnMissingInput()
     {
-        $this->expectException('Symfony\Component\Console\Exception\RuntimeException');
-        $this->expectExceptionMessage('Aborted.');
         $dialog = new SymfonyQuestionHelper();
         $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
     }
 
-    public function testChoiceQuestionPadding()
-    {
-        $choiceQuestion = new ChoiceQuestion('qqq', [
-            'foo' => 'foo',
-            'żółw' => 'bar',
-            'łabądź' => 'baz',
-        ]);
-
-        (new SymfonyQuestionHelper())->ask(
-            $this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
-            $output = $this->createOutputInterface(),
-            $choiceQuestion
-        );
-
-        $this->assertOutputContains(<<<EOT
- qqq:
-  [foo   ] foo
-  [żółw  ] bar
-  [łabądź] baz
- > 
-EOT
-        , $output, true);
-    }
-
-    public function testChoiceQuestionCustomPrompt()
-    {
-        $choiceQuestion = new ChoiceQuestion('qqq', ['foo']);
-        $choiceQuestion->setPrompt(' >ccc> ');
-
-        (new SymfonyQuestionHelper())->ask(
-            $this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
-            $output = $this->createOutputInterface(),
-            $choiceQuestion
-        );
-
-        $this->assertOutputContains(<<<EOT
- qqq:
-  [0] foo
- >ccc> 
-EOT
-        , $output, true);
-    }
-
     protected function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);
@@ -200,15 +159,10 @@ EOT
         return $mock;
     }
 
-    private function assertOutputContains($expected, StreamOutput $output, $normalize = false)
+    private function assertOutputContains($expected, StreamOutput $output)
     {
         rewind($output->getStream());
         $stream = stream_get_contents($output->getStream());
-
-        if ($normalize) {
-            $stream = str_replace(\PHP_EOL, "\n", $stream);
-        }
-
-        $this->assertStringContainsString($expected, $stream);
+        $this->assertContains($expected, $stream);
     }
 }