Merge branch '2.3' into 2.6

nicolas-grekas · nicolas-grekas · commit 984733e85339 · 2015-04-03T17:17:51.000+02:00
* 2.3:
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [StringUtil] Fixed singularification of 'movies'
  Fix some phpdocs for Twig extensions &amp; templating helpers
  Use specialized config methods instead of the generic ifTrue() method
  [DoctrineBridge] Add missing variable declaration in testcase

Conflicts:
	src/Symfony/Component/Console/Application.php
diff --git a/Templating/Helper/LogoutUrlHelper.php b/Templating/Helper/LogoutUrlHelper.php
@@ -121,9 +121,7 @@ private function generateLogoutUrl($key, $referenceType)
     }
 
     /**
-     * Returns the canonical name of this helper.
-     *
-     * @return string The canonical name
+     * {@inheritdoc}
      */
     public function getName()
     {
diff --git a/Templating/Helper/SecurityHelper.php b/Templating/Helper/SecurityHelper.php
@@ -48,9 +48,7 @@ public function isGranted($role, $object = null, $field = null)
     }
 
     /**
-     * Returns the canonical name of this helper.
-     *
-     * @return string The canonical name
+     * {@inheritdoc}
      */
     public function getName()
     {

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,7 @@ private function generateLogoutUrl($key, $referenceType)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * Returns the canonical name of this helper.`
`125`		`- *`
`126`		`- * @return string The canonical name`
	`124`	`+ * {@inheritdoc}`
`127`	`125`	`*/`
`128`	`126`	`public function getName()`
`129`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,7 @@ public function isGranted($role, $object = null, $field = null)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Returns the canonical name of this helper.`
`52`		`- *`
`53`		`- * @return string The canonical name`
	`51`	`+ * {@inheritdoc}`
`54`	`52`	`*/`
`55`	`53`	`public function getName()`
`56`	`54`	`{`