Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 601cc0827df6 · 2018-07-05T13:53:23.000+02:00
* 2.8:
  [DomCrawler] Fix ChoiceFormField::select() PHPDoc
  [HttpFoundation] add tests for FlashBagInterface::setAll()
  Check for Hyper terminal on all operating systems.
  Prevent toolbar links color override by css
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -311,13 +311,16 @@ private static function hasColorSupport()
             return false;
         }
 
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
         if (DIRECTORY_SEPARATOR === '\\') {
             return (function_exists('sapi_windows_vt100_support')
                 && sapi_windows_vt100_support(STDOUT))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig
@@ -160,11 +160,11 @@
     margin-bottom: 0;
 }
 
-.sf-toolbar-block .sf-toolbar-info-piece a {
+div.sf-toolbar .sf-toolbar-block .sf-toolbar-info-piece a {
     color: #99CDD8;
     text-decoration: underline;
 }
-.sf-toolbar-block .sf-toolbar-info-piece a:hover {
+div.sf-toolbar .sf-toolbar-block a:hover {
     text-decoration: none;
 }
 
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -93,13 +93,16 @@ protected function doWrite($message, $newline)
      */
     protected function hasColorSupport()
     {
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
         if (DIRECTORY_SEPARATOR === '\\') {
             return (function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($this->stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -269,7 +269,7 @@ public function createProgressBar($max = 0)
     {
         $progressBar = parent::createProgressBar($max);
 
-        if ('\\' !== DIRECTORY_SEPARATOR ||  'Hyper' === getenv('TERM_PROGRAM')) {
+        if ('\\' !== DIRECTORY_SEPARATOR || 'Hyper' === getenv('TERM_PROGRAM')) {
             $progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
             $progressBar->setProgressCharacter('');
             $progressBar->setBarCharacter('▓'); // dark shade character \u2593
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -75,7 +75,7 @@ public function isDisabled()
     /**
      * Sets the value of the field.
      *
-     * @param string $value The value of the field
+     * @param string|array $value The value of the field
      */
     public function select($value)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Flash/FlashBagTest.php
@@ -124,6 +124,19 @@ public function testKeys()
         $this->assertEquals(array('notice'), $this->bag->keys());
     }
 
+    public function testSetAll()
+    {
+        $this->bag->add('one_flash', 'Foo');
+        $this->bag->add('another_flash', 'Bar');
+        $this->assertTrue($this->bag->has('one_flash'));
+        $this->assertTrue($this->bag->has('another_flash'));
+        $this->bag->setAll(array('unique_flash' => 'FooBar'));
+        $this->assertFalse($this->bag->has('one_flash'));
+        $this->assertFalse($this->bag->has('another_flash'));
+        $this->assertSame(array('unique_flash' => 'FooBar'), $this->bag->all());
+        $this->assertSame(array(), $this->bag->all());
+    }
+
     public function testPeekAll()
     {
         $this->bag->set('notice', 'Foo');
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -541,13 +541,16 @@ private function hasColorSupport($stream)
             return false;
         }
 
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
         if (DIRECTORY_SEPARATOR === '\\') {
             return (function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {

Original file line number	Diff line number	Diff line change
`@@ -160,11 +160,11 @@`
`160`	`160`	`margin-bottom: 0;`
`161`	`161`	`}`
`162`	`162`
`163`		`-.sf-toolbar-block .sf-toolbar-info-piece a {`
	`163`	`+div.sf-toolbar .sf-toolbar-block .sf-toolbar-info-piece a {`
`164`	`164`	`color: #99CDD8;`
`165`	`165`	`text-decoration: underline;`
`166`	`166`	`}`
`167`		`-.sf-toolbar-block .sf-toolbar-info-piece a:hover {`
	`167`	`+div.sf-toolbar .sf-toolbar-block a:hover {`
`168`	`168`	`text-decoration: none;`
`169`	`169`	`}`
`170`	`170`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ public function createProgressBar($max = 0)`
`269`	`269`	`{`
`270`	`270`	`$progressBar = parent::createProgressBar($max);`
`271`	`271`
`272`		`- if ('\\' !== DIRECTORY_SEPARATOR \|\| 'Hyper' === getenv('TERM_PROGRAM')) {`
	`272`	`+ if ('\\' !== DIRECTORY_SEPARATOR \|\| 'Hyper' === getenv('TERM_PROGRAM')) {`
`273`	`273`	`$progressBar->setEmptyBarCharacter('░'); // light shade character \u2591`
`274`	`274`	`$progressBar->setProgressCharacter('');`
`275`	`275`	`$progressBar->setBarCharacter('▓'); // dark shade character \u2593`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function isDisabled()`
`75`	`75`	`/**`
`76`	`76`	`* Sets the value of the field.`
`77`	`77`	`*`
`78`		`- * @param string $value The value of the field`
	`78`	`+ * @param string\|array $value The value of the field`
`79`	`79`	`*/`
`80`	`80`	`public function select($value)`
`81`	`81`	`{`