Minor tweaks

nicolas-grekas · nicolas-grekas · commit 614d6ba55cbd · 2016-06-16T07:42:39.000+02:00
diff --git 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,14 +34,15 @@ public static function assertDeprecationsAreTriggered($expectedMessages, $testCo
     /**
      * @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)
     {
         if (!is_callable($testCode)) {
             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 @@ public static function assertErrorsAreTriggered($expectedType, $expectedMessages
         } 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);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ final class ErrorAssert`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @param string[] $expectedMessages Expected deprecation messages`
`23`		`- * @param callable $testCode A callable that is expected to trigger the expected deprecation messages when being executed`
	`23`	`+ * @param callable $testCode A callable that is expected to trigger the deprecation messages`
`24`	`24`	`*/`
`25`	`25`	`public static function assertDeprecationsAreTriggered($expectedMessages, $testCode)`
`26`	`26`	`{`
`@@ -34,14 +34,15 @@ public static function assertDeprecationsAreTriggered($expectedMessages, $testCo`
`34`	`34`	`/**`
`35`	`35`	`* @param int $expectedType Expected triggered error type (pass one of PHP's E_* constants)`
`36`	`36`	`* @param string[] $expectedMessages Expected error messages`
`37`		`- * @param callable $testCode A callable that is expected to trigger the expected messages when being executed`
	`37`	`+ * @param callable $testCode A callable that is expected to trigger the error messages`
`38`	`38`	`*/`
`39`	`39`	`public static function assertErrorsAreTriggered($expectedType, $expectedMessages, $testCode)`
`40`	`40`	`{`
`41`	`41`	`if (!is_callable($testCode)) {`
`42`	`42`	`throw new \InvalidArgumentException(sprintf('The code to be tested must be a valid callable ("%s" given).', gettype($testCode)));`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ $e = null;`
`45`	`46`	`$triggeredMessages = array();`
`46`	`47`
`47`	`48`	`try {`
`@@ -56,17 +57,16 @@ public static function assertErrorsAreTriggered($expectedType, $expectedMessages`
`56`	`57`	`} catch (\Exception $e) {`
`57`	`58`	`} catch (\Throwable $e) {`
`58`	`59`	`}`
`59`		`-`
`60`	`60`	`restore_error_handler();`
`61`	`61`
`62`		`- if (isset($e)) {`
	`62`	`+ if (null !== $e) {`
`63`	`63`	`throw $e;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`\PHPUnit_Framework_Assert::assertCount(count($expectedMessages), $triggeredMessages);`
`67`	`67`
`68`		`- for ($i = 0; $i < count($triggeredMessages); ++$i) {`
`69`		`- \PHPUnit_Framework_Assert::assertContains($expectedMessages[$i], $triggeredMessages[$i]);`
	`68`	`+ foreach ($triggeredMessages as $i => $message) {`
	`69`	`+ \PHPUnit_Framework_Assert::assertContains($expectedMessages[$i], $message);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`