From 614d6ba55cbd736c2459c7fea11f0babb5f5eec1 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 16 Jun 2016 07:42:39 +0200
Subject: [PATCH] Minor tweaks

---
 src/Symfony/Bridge/PhpUnit/ErrorAssert.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
index 0d255bc0f2..84da934a1a 100644
--- a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
+++ b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php
@@ -20,7 +20,7 @@ final class ErrorAssert
 {
     /**
      * @param string[] $expectedMessages Expected deprecation messages
-     * @param callable $testCode         A callable that is expected to trigger the expected deprecation messages when being executed
+     * @param callable $testCode         A callable that is expected to trigger the deprecation messages
      */
     public static function assertDeprecationsAreTriggered($expectedMessages, $testCode)
     {
@@ -34,7 +34,7 @@ final class ErrorAssert
     /**
      * @param int      $expectedType     Expected triggered error type (pass one of PHP's E_* constants)
      * @param string[] $expectedMessages Expected error messages
-     * @param callable $testCode         A callable that is expected to trigger the expected messages when being executed
+     * @param callable $testCode         A callable that is expected to trigger the error messages
      */
     public static function assertErrorsAreTriggered($expectedType, $expectedMessages, $testCode)
     {
@@ -42,6 +42,7 @@ final class ErrorAssert
             throw new \InvalidArgumentException(sprintf('The code to be tested must be a valid callable ("%s" given).', gettype($testCode)));
         }
 
+        $e = null;
         $triggeredMessages = array();
 
         try {
@@ -56,17 +57,16 @@ final class ErrorAssert
         } catch (\Exception $e) {
         } catch (\Throwable $e) {
         }
-
         restore_error_handler();
 
-        if (isset($e)) {
+        if (null !== $e) {
             throw $e;
         }
 
         \PHPUnit_Framework_Assert::assertCount(count($expectedMessages), $triggeredMessages);
 
-        for ($i = 0; $i < count($triggeredMessages); ++$i) {
-            \PHPUnit_Framework_Assert::assertContains($expectedMessages[$i], $triggeredMessages[$i]);
+        foreach ($triggeredMessages as $i => $message) {
+            \PHPUnit_Framework_Assert::assertContains($expectedMessages[$i], $message);
         }
     }
 }