@@ -25,16 +25,17 @@ interface TestAppInterface extends HttpKernelInterface, TerminableInterface
2525 */
2626class RunnerTest extends TestCase
2727{
28-
29- static function runData (): iterable
28+ public static function runData (): iterable
3029 {
3130 yield 'basic ' => [];
31+
3232 yield 'middleware ' => [
33- 'middleware ' => TestMiddleware::class
33+ 'middleware ' => TestMiddleware::class,
3434 ];
35+
3536 yield 'Invalid middleware ' => [
3637 'middleware ' => InvalidMiddleware::class,
37- 'expectException ' => InvalidMiddlewareException::class
38+ 'expectException ' => InvalidMiddlewareException::class,
3839 ];
3940 }
4041
@@ -43,15 +44,11 @@ static function runData(): iterable
4344 */
4445 public function testRun (
4546 ?string $ middleware = null ,
46- ?string $ expectException = null
47+ ?string $ expectException = null ,
4748 ): void {
48- if ($ expectException !== null ) {
49- $ this ->expectException ($ expectException );
50- }
51-
5249 $ application = $ this ->createMock (TestAppInterface::class);
5350
54- if ($ expectException === null ) {
51+ if (null === $ expectException ) {
5552 $ application
5653 ->expects ($ this ->once ())
5754 ->method ('handle ' )
@@ -67,6 +64,8 @@ function (
6764 }
6865 );
6966 $ application ->expects ($ this ->once ())->method ('terminate ' );
67+ } else {
68+ $ this ->expectException ($ expectException );
7069 }
7170
7271 $ _SERVER ['FOO ' ] = 'bar ' ;
@@ -75,7 +74,7 @@ function (
7574 $ middleware
7675 ]));
7776
78- $ assertMiddlewareInvoked = $ expectException === null && $ middleware && method_exists ($ middleware , 'isInvoked ' );
77+ $ assertMiddlewareInvoked = null === $ expectException && $ middleware && method_exists ($ middleware , 'isInvoked ' );
7978 if ($ assertMiddlewareInvoked ) {
8079 $ this ->assertFalse ($ middleware ::isInvoked ());
8180 }
0 commit comments