Merge branch '6.4' into 7.0

* 6.4:
  [Console] Dispatch `ConsoleTerminateEvent` when exiting on signal
  [Cache][VarExporter] Fix proxy generation to deal with edgy behaviors of internal classes
  fix detecting the installed FrameworkBundle version
  [Notifier] [Telegram] Fix version and exception signature
  fix tests, partially reverts 1333caf89af4630e03f792c45b62c4dee6b5bf3a
  fix tests
  Fix merge error with ErrorLoggerCompilerPass

Author: xabbuh

Exception/MultipleExclusiveOptionsUsedException.php

@@ -17,15 +17,16 @@
 class MultipleExclusiveOptionsUsedException extends InvalidArgumentException
 {
     /**
-     * @param string[]      $usedExclusiveOptions
-     * @param string[]|null $exclusiveOptions
+     * @param string[] $usedExclusiveOptions
+     * @param string[] $exclusiveOptions
      */
-    public function __construct(array $usedExclusiveOptions, array $exclusiveOptions = null, \Throwable $previous = null)
+    public function __construct(array $usedExclusiveOptions, array $exclusiveOptions, \Throwable $previous = null)
     {
-        $message = sprintf('Multiple exclusive options have been used "%s".', implode('", "', $usedExclusiveOptions));
-        if (null !== $exclusiveOptions) {
-            $message .= sprintf(' Only one of %s can be used.', implode('", "', $exclusiveOptions));
-        }
+        $message = sprintf(
+            'Multiple exclusive options have been used "%s". Only one of "%s" can be used.',
+            implode('", "', $usedExclusiveOptions),
+            implode('", "', $exclusiveOptions)
+        );
 
         parent::__construct($message, 0, $previous);
     }

Tests/Exception/MultipleExclusiveOptionsUsedExceptionTest.php

@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Notifier\Tests\Exception;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Notifier\Exception\MultipleExclusiveOptionsUsedException;
+
+class MultipleExclusiveOptionsUsedExceptionTest extends TestCase
+{
+    public function testMessage()
+    {
+        $exception = new MultipleExclusiveOptionsUsedException(['foo', 'bar'], ['foo', 'bar', 'baz']);
+
+        $this->assertSame(
+            'Multiple exclusive options have been used "foo", "bar". Only one of "foo", "bar", "baz" can be used.',
+            $exception->getMessage()
+        );
+    }
+}