浏览代码

[AbstractDoctrineBundle] fixed typo

Martin Hason 14 年之前
父节点
当前提交
e441fc95a8

+ 12 - 12
src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php

@@ -37,10 +37,10 @@ abstract class AbstractDoctrineExtension extends Extension
     protected $drivers = array();
 
     /*
-     * @param array $entityManager A configured ORM entity manager.
-     * @param ContainerBuilder $container A ContainerBuilder instance
+     * @param array            $objectManager A configured object manager.
+     * @param ContainerBuilder $container     A ContainerBuilder instance
      */
-    protected function loadMappingInformation(array $objectManager, $container)
+    protected function loadMappingInformation(array $objectManager, ContainerBuilder $container)
     {
         if (isset($objectManager['mappings'])) {
             foreach ($objectManager['mappings'] as $mappingName => $mappingConfig) {
@@ -111,7 +111,7 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Register the mapping driver configuration for later use with the object managers metadata driver chain.
      *
-     * @param array $mappingConfig
+     * @param array  $mappingConfig
      * @param string $mappingName
      * @return void
      */
@@ -135,11 +135,11 @@ abstract class AbstractDoctrineExtension extends Extension
      *
      * @param array            $bundleConfig
      * @param \ReflectionClass $bundle
-     * @param Container        $container
+     * @param ContainerBuilder $container    A ContainerBuilder instance
      *
      * @return array|false
      */
-    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, $container)
+    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container)
     {
         $bundleDir = dirname($bundle->getFilename());
 
@@ -171,10 +171,10 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Register all the collected mapping information with the object manager by registering the appropriate mapping drivers.
      *
-     * @param array $objectManager
-     * @param Container $container
+     * @param array            $objectManager
+     * @param ContainerBuilder $container     A ContainerBuilder instance
      */
-    protected function registerMappingDrivers($objectManager, $container)
+    protected function registerMappingDrivers($objectManager, ContainerBuilder $container)
     {
         // configure metadata driver for each bundle based on the type of mapping files found
         if ($container->hasDefinition($this->getObjectManagerElementName($objectManager['name'] . '_metadata_driver'))) {
@@ -220,7 +220,7 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Assertion if the specified mapping information is valid.
      *
-     * @param array $mappingConfig
+     * @param array  $mappingConfig
      * @param string $objectManagerName
      */
     protected function assertValidMappingConfiguration(array $mappingConfig, $objectManagerName)
@@ -246,8 +246,8 @@ abstract class AbstractDoctrineExtension extends Extension
     /**
      * Detects what metadata driver to use for the supplied directory.
      *
-     * @param string $dir A directory path
-     * @param ContainerBuilder $container A ContainerBuilder configuration
+     * @param string           $dir       A directory path
+     * @param ContainerBuilder $container A ContainerBuilder instance
      *
      * @return string|null A metadata driver short name, if one can be detected
      */