Skip to content

Commit a16d471

Browse files
committed
Merge branch '2.4'
* 2.4: [Form][2.3] Fixes empty file-inputs getting treated as extra field. changed some PHPUnit assertions to more specific ones fixed Kernel::stripComments() normalizing new-lines added a BC comment Update FileLoader to fix issue #10339 bumped Symfony version to 2.3.12 updated VERSION for 2.3.11 update CONTRIBUTORS for 2.3.11 updated CHANGELOG for 2.3.11 Throw exception when unable to normalize embedded object Fixed evaluation of short circuit operators Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline. [2.4][HttpKernel] Fix issue #10209 When the profiler has `only_exception` option activated and a subrequest throw an exception, the parent profile cannot be found.
2 parents 9932270 + ef20f1f commit a16d471

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Tests/ApplicationTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ public function testAll()
102102
{
103103
$application = new Application();
104104
$commands = $application->all();
105-
$this->assertEquals('Symfony\\Component\\Console\\Command\\HelpCommand', get_class($commands['help']), '->all() returns the registered commands');
105+
$this->assertInstanceOf('Symfony\\Component\\Console\\Command\\HelpCommand', $commands['help'], '->all() returns the registered commands');
106106

107107
$application->add(new \FooCommand());
108108
$commands = $application->all('foo');
109-
$this->assertEquals(1, count($commands), '->all() takes a namespace as its first argument');
109+
$this->assertCount(1, $commands, '->all() takes a namespace as its first argument');
110110
}
111111

112112
public function testRegister()
@@ -535,8 +535,8 @@ public function testRun()
535535
$application->run();
536536
ob_end_clean();
537537

538-
$this->assertSame('Symfony\Component\Console\Input\ArgvInput', get_class($command->input), '->run() creates an ArgvInput by default if none is given');
539-
$this->assertSame('Symfony\Component\Console\Output\ConsoleOutput', get_class($command->output), '->run() creates a ConsoleOutput by default if none is given');
538+
$this->assertInstanceOf('Symfony\Component\Console\Input\ArgvInput', $command->input, '->run() creates an ArgvInput by default if none is given');
539+
$this->assertInstanceOf('Symfony\Component\Console\Output\ConsoleOutput', $command->output, '->run() creates a ConsoleOutput by default if none is given');
540540

541541
$application = new Application();
542542
$application->setAutoExit(false);

0 commit comments

Comments
 (0)