Skip to content

Commit 537544e

Browse files
Merge branch '3.4' into 4.3
* 3.4: (21 commits) [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations [Routing] Fix return type declarations ...
2 parents 416bc9c + da88ef6 commit 537544e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1920,9 +1920,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
19201920
}
19211921

19221922
/**
1923-
* Returns the base path for the XSD files.
1924-
*
1925-
* @return string The XSD base path
1923+
* {@inheritdoc}
19261924
*/
19271925
public function getXsdValidationBasePath()
19281926
{

Tests/Functional/ProfilerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public function testProfilerIsDisabled($insulate)
2424
}
2525

2626
$client->request('GET', '/profiler');
27-
$this->assertFalse($client->getProfile());
27+
$this->assertNull($client->getProfile());
2828

2929
// enable the profiler for the next request
3030
$client->enableProfiler();
31-
$this->assertFalse($client->getProfile());
31+
$this->assertNull($client->getProfile());
3232
$client->request('GET', '/profiler');
3333
$this->assertIsObject($client->getProfile());
3434

3535
$client->request('GET', '/profiler');
36-
$this->assertFalse($client->getProfile());
36+
$this->assertNull($client->getProfile());
3737
}
3838

3939
public function getConfigs()

0 commit comments

Comments
 (0)