Skip to content

Commit 189e0ad

Browse files
committed
Merge branch '3.1'
* 3.1: [TwigBridge] removed deprecations added in Twig 1.27 PHP CS Fixer: use php_unit_dedicate_assert 3.0 Upgrade Guide: Added details describing how to pass data to a form through the options resolver fixed Filesystem:makePathRelative and added 2 more testcases no 304 response if method is not cacheable move tags from decorated to decorating service
2 parents b20e764 + 77eb93c commit 189e0ad

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Functional/ProfilerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testProfilerIsDisabled($insulate)
3030
$client->enableProfiler();
3131
$crawler = $client->request('GET', '/profiler');
3232
$profile = $client->getProfile();
33-
$this->assertTrue(is_object($profile));
33+
$this->assertInternalType('object', $profile);
3434

3535
$client->request('GET', '/profiler');
3636
$this->assertFalse($client->getProfile());

0 commit comments

Comments
 (0)