merged branch nomack84/fixed_docblocks (PR #6033)

This PR was merged into the master branch.

Commits
-------

644de74 Fix docblock in Doctrine Bridge

Discussion
----------

Fix docblocks in Doctrine Bridge

src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

@@ -46,6 +46,9 @@ class ProxyCacheWarmer implements CacheWarmerInterface
         return false;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function warmUp($cacheDir)
     {
         foreach ($this->registry->getManagers() as $em) {

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

@@ -68,6 +68,7 @@ class ContainerAwareEventManager extends EventManager
      * Gets the listeners of a specific event or all listeners.
      *
      * @param string $event The name of the event.
+     *
      * @return array The event listeners for the specified event, or all event listeners.
      */
     public function getListeners($event = null)
@@ -79,6 +80,7 @@ class ContainerAwareEventManager extends EventManager
      * Checks whether an event has any registered listeners.
      *
      * @param string $event
+     *
      * @return boolean TRUE if the specified event has any listeners, FALSE otherwise.
      */
     public function hasListeners($event)

src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

@@ -148,6 +148,7 @@ class DoctrineDataCollector extends DataCollector
      * value to explain the query).
      *
      * @param mixed $var
+     *
      * @return array
      */
     private function sanitizeParam($var)

src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

@@ -369,6 +369,7 @@ abstract class AbstractDoctrineExtension extends Extension
      * @example $name is 'entity_manager' then the result would be 'doctrine.orm.entity_manager'
      *
      * @param string $name
+     *
      * @return string
      */
     abstract protected function getObjectManagerElementName($name);