Skip to content

Commit 067879f

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: [Tests] Change to willThrowException [Console] fix PHPDoc in Command Fix wrong calls to clearstatcache Add Vietnamese translation for validators Allow running PHPUnit with "xdebug.scream" ON [Yaml] detect circular references
2 parents 8a9f2ff + 9f112b3 commit 067879f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Command/TranslationDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function testDebugInvalidDirectory()
103103
$kernel->expects($this->once())
104104
->method('getBundle')
105105
->with($this->equalTo('dir'))
106-
->will($this->throwException(new \InvalidArgumentException()));
106+
->willThrowException(new \InvalidArgumentException());
107107

108108
$tester = $this->createCommandTester(array(), array(), $kernel);
109109
$tester->execute(array('locale' => 'en', 'bundle' => 'dir'));

Tests/Templating/Loader/TemplateLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testThrowsExceptionWhenTemplateNotFound()
6060
$fileLocator
6161
->expects($this->once())
6262
->method('locate')
63-
->will($this->throwException(new \InvalidArgumentException($errorMessage)))
63+
->willThrowException(new \InvalidArgumentException($errorMessage))
6464
;
6565

6666
$locator = new TemplateLocator($fileLocator);

0 commit comments

Comments
 (0)