Skip to content

Commit 025e134

Browse files
Merge branch '4.1' into 4.2
* 4.1: [Twig] Replace for-loops with blocks for attributes fixed CS [Tests] Change to willThrowException [Console] fix PHPDoc in Command Update FileLoaderLoadException.php Fix wrong calls to clearstatcache Add Vietnamese translation for validators Allow running PHPUnit with "xdebug.scream" ON [VarDumper] Add descriptors tests [Yaml] detect circular references [DI] fix reporting bindings on overriden services as unused [Routing] minor fix or previous PR
2 parents dd6a54a + 067879f commit 025e134

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
@@ -123,7 +123,7 @@ public function testDebugInvalidDirectory()
123123
$kernel->expects($this->once())
124124
->method('getBundle')
125125
->with($this->equalTo('dir'))
126-
->will($this->throwException(new \InvalidArgumentException()));
126+
->willThrowException(new \InvalidArgumentException());
127127

128128
$tester = $this->createCommandTester(array(), array(), $kernel);
129129
$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)