merged branch nomack84/fixed_docblocks (PR #6033)

fabpot · fabpot · commit 9c6497f3ea02 · 2012-11-17T18:06:24.000+01:00
This PR was merged into the master branch. Commits ------- 644de74 Fix docblock in Doctrine Bridge Discussion ---------- Fix docblocks in Doctrine Bridge
diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -46,6 +46,9 @@ public function isOptional()
         return false;
     }
 
+    /**
+     * {@inheritdoc}
+     */
     public function warmUp($cacheDir)
     {
         foreach ($this->registry->getManagers() as $em) {
diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php
@@ -68,6 +68,7 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)
      * 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 @@ public function getListeners($event = null)
      * 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)
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -148,6 +148,7 @@ private function sanitizeQuery($connectionName, $query)
      * value to explain the query).
      *
      * @param mixed $var
+     *
      * @return array
      */
     private function sanitizeParam($var)
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
@@ -369,6 +369,7 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB
      * @example $name is 'entity_manager' then the result would be 'doctrine.orm.entity_manager'
      *
      * @param string $name
+     *
      * @return string
      */
     abstract protected function getObjectManagerElementName($name);

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ public function isOptional()`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ /**`
	`50`	`+ * {@inheritdoc}`
	`51`	`+ */`
`49`	`52`	`public function warmUp($cacheDir)`
`50`	`53`	`{`
`51`	`54`	`foreach ($this->registry->getManagers() as $em) {`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ private function sanitizeQuery($connectionName, $query)`
`148`	`148`	`* value to explain the query).`
`149`	`149`	`*`
`150`	`150`	`* @param mixed $var`
	`151`	`+ *`
`151`	`152`	`* @return array`
`152`	`153`	`*/`
`153`	`154`	`private function sanitizeParam($var)`
Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ protected function loadObjectManagerCacheDriver(array $objectManager, ContainerB`
`369`	`369`	`* @example $name is 'entity_manager' then the result would be 'doctrine.orm.entity_manager'`
`370`	`370`	`*`
`371`	`371`	`* @param string $name`
	`372`	`+ *`
`372`	`373`	`* @return string`
`373`	`374`	`*/`
`374`	`375`	`abstract protected function getObjectManagerElementName($name);`