minor #19410 [DoctrineBridge] Fixed php doc (zomberg)

nicolas-grekas · nicolas-grekas · commit 0f0703497f7f · 2016-07-26T06:38:52.000+02:00
This PR was squashed before being merged into the 2.7 branch (closes #19410). Discussion ---------- [DoctrineBridge] Fixed php doc | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ Commits ------- b2d25f4 [DoctrineBridge] Fixed php doc
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -314,10 +314,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
     /**
      * Loads a cache driver.
      *
-     * @param string                                                  $cacheDriverServiceId The cache driver name
-     * @param string                                                  $objectManagerName    The object manager name
-     * @param array                                                   $cacheDriver          The cache driver mapping
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container            The ContainerBuilder instance
+     * @param string           $cacheName         The cache driver name
+     * @param string           $objectManagerName The object manager name
+     * @param array            $cacheDriver       The cache driver mapping
+     * @param ContainerBuilder $container         The ContainerBuilder instance
      *
      * @return string
      *
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -111,7 +111,7 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
      * @param string[]             $managerParameters       List of container parameters that could
      *                                                      hold the manager name.
      * @param string               $driverPattern           Pattern for the metadata driver service name
-     * @param string               $enabledParameter        Service container parameter that must be
+     * @param string|false         $enabledParameter        Service container parameter that must be
      *                                                      present to enable the mapping. Set to false
      *                                                      to not do any check, optional.
      * @param string               $configurationPattern    Pattern for the Configuration service name

Original file line number	Diff line number	Diff line change
`@@ -314,10 +314,10 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB`
`314`	`314`	`/**`
`315`	`315`	`* Loads a cache driver.`
`316`	`316`	`*`
`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`
`321`	`321`	`*`
`322`	`322`	`* @return string`
`323`	`323`	`*`