Skip to content

Commit 982f4fb

Browse files
Merge branch '2.8' into 3.0
* 2.8: [Console] Application update PHPDoc of add and register methods [Config] Extra tests for Config component Fixed bugs in names of classes and methods. [DoctrineBridge] Fixed php doc [FrameworkBundle] Fixed parameters number mismatch declaration [BrowserKit] Added test for followRedirect method (POST method) Fix the money form type render with Bootstrap3 [BrowserKit] Uppercase the "GET" method in redirects [DomCrawler] Inherit the namespace cache in subcrawlers [WebProfilerBundle] Fixed JSDoc parameter definition [HttpFoundation] HttpCache refresh stale responses containing an ETag Conflicts: src/Symfony/Component/Finder/Tests/Shell/CommandTest.php
2 parents 7734d6d + ea7cc3b commit 982f4fb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
314314
/**
315315
* Loads a cache driver.
316316
*
317-
* @param string $cacheDriverServiceId The cache driver name
318-
* @param string $objectManagerName The object manager name
319-
* @param array $cacheDriver The cache driver mapping
320-
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container The ContainerBuilder instance
317+
* @param string $cacheName The cache driver name
318+
* @param string $objectManagerName The object manager name
319+
* @param array $cacheDriver The cache driver mapping
320+
* @param ContainerBuilder $container The ContainerBuilder instance
321321
*
322322
* @return string
323323
*

DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
111111
* @param string[] $managerParameters List of container parameters that could
112112
* hold the manager name.
113113
* @param string $driverPattern Pattern for the metadata driver service name
114-
* @param string $enabledParameter Service container parameter that must be
114+
* @param string|false $enabledParameter Service container parameter that must be
115115
* present to enable the mapping. Set to false
116116
* to not do any check, optional.
117117
* @param string $configurationPattern Pattern for the Configuration service name

0 commit comments

Comments
 (0)