simonsargeant
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Output/StreamOutput.php‎
Lines changed: 6 additions & 2 deletions b/‎src/Symfony/Component/Console/Output/StreamOutput.php‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php‎
Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/Symfony/Component/EventDispatcher/EventDispatcher.php‎
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/EventDispatcher/EventDispatcher.php‎
Lines changed: 1 addition & 1 deletion
@@ -80,7 +80,7 @@ protected function configure()
 
   <info>php %command.full_name% --parameters</info>
 
-Display a specific parameter by specifying his name with the <info>--parameter</info> option:
+Display a specific parameter by specifying its name with the <info>--parameter</info> option:
 
   <info>php %command.full_name% --parameter=kernel.debug</info>
 
 
@@ -83,15 +83,19 @@ protected function doWrite($message, $newline)
      *
      * Colorization is disabled if not supported by the stream:
      *
-     *  -  Windows without Ansicon, ConEmu or Mintty
+     *  -  Windows before 10.0.10586 without Ansicon, ConEmu or Mintty
      *  -  non tty consoles
      *
      * @return bool true if the stream supports colorization, false otherwise
      */
     protected function hasColorSupport()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM');
+            return
+                0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)
+                || false !== getenv('ANSICON')
+                || 'ON' === getenv('ConEmuANSI')
+                || 'xterm' === getenv('TERM');
         }
 
         return function_exists('posix_isatty') && @posix_isatty($this->stream);
 
@@ -116,6 +116,10 @@ public function dispatch($eventName, Event $event = null)
             $event = new Event();
         }
 
+        if (null !== $this->logger && $event->isPropagationStopped()) {
+            $this->logger->debug(sprintf('The "%s" event is already stopped. No listeners have been called.', $eventName));
+        }
+
         $this->preProcess($eventName);
         $this->preDispatch($eventName, $event);
 
 
@@ -155,10 +155,10 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
     protected function doDispatch($listeners, $eventName, Event $event)
     {
         foreach ($listeners as $listener) {
-            call_user_func($listener, $event, $eventName, $this);
             if ($event->isPropagationStopped()) {
                 break;
             }
+            call_user_func($listener, $event, $eventName, $this);
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -83,15 +83,19 @@ protected function doWrite($message, $newline)`
`83`	`83`	`*`
`84`	`84`	`* Colorization is disabled if not supported by the stream:`
`85`	`85`	`*`
`86`		`- * - Windows without Ansicon, ConEmu or Mintty`
	`86`	`+ * - Windows before 10.0.10586 without Ansicon, ConEmu or Mintty`
`87`	`87`	`* - non tty consoles`
`88`	`88`	`*`
`89`	`89`	`* @return bool true if the stream supports colorization, false otherwise`
`90`	`90`	`*/`
`91`	`91`	`protected function hasColorSupport()`
`92`	`92`	`{`
`93`	`93`	`if (DIRECTORY_SEPARATOR === '\\') {`
`94`		`- return false !== getenv('ANSICON') \|\| 'ON' === getenv('ConEmuANSI') \|\| 'xterm' === getenv('TERM');`
	`94`	`+ return`
	`95`	`+ 0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)`
	`96`	`+ \|\| false !== getenv('ANSICON')`
	`97`	`+ \|\| 'ON' === getenv('ConEmuANSI')`
	`98`	`+ \|\| 'xterm' === getenv('TERM');`
`95`	`99`	`}`
`96`	`100`
`97`	`101`	`return function_exists('posix_isatty') && @posix_isatty($this->stream);`
Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,10 @@ public function dispatch($eventName, Event $event = null)`
`116`	`116`	`$event = new Event();`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ if (null !== $this->logger && $event->isPropagationStopped()) {`
	`120`	`+ $this->logger->debug(sprintf('The "%s" event is already stopped. No listeners have been called.', $eventName));`
	`121`	`+ }`
	`122`	`+`
`119`	`123`	`$this->preProcess($eventName);`
`120`	`124`	`$this->preDispatch($eventName, $event);`
`121`	`125`
Original file line number	Diff line number	Diff line change
`@@ -155,10 +155,10 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)`
`155`	`155`	`protected function doDispatch($listeners, $eventName, Event $event)`
`156`	`156`	`{`
`157`	`157`	`foreach ($listeners as $listener) {`
`158`		`- call_user_func($listener, $event, $eventName, $this);`
`159`	`158`	`if ($event->isPropagationStopped()) {`
`160`	`159`	`break;`
`161`	`160`	`}`
	`161`	`+ call_user_func($listener, $event, $eventName, $this);`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`