Revert "expanded namespaces within phpdoc (special for PhpStorm)"

This reverts commit 6e7439e73ade26bca01edc193c836b35aaa91ffe.

src/Symfony/Bundle/FrameworkBundle/Command/ContainerAwareCommand.php

@@ -28,13 +28,10 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
 {
     /**
-     * @var \Symfony\Component\DependencyInjection\ContainerInterface
+     * @var ContainerInterface
      */
     private $container;
 
-    /**
-     * @return \Symfony\Component\DependencyInjection\ContainerInterface
-     */
     protected function getContainer()
     {
         if (null === $this->container) {

src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php

@@ -51,7 +51,7 @@ class Controller extends ContainerAware
      * @param  array   $path       An array of path parameters
      * @param  array   $query      An array of query parameters
      *
-     * @return \Symfony\Component\HttpFoundation\Response A Response instance
+     * @return Response A Response instance
      */
     public function forward($controller, array $path = array(), array $query = array())
     {
@@ -64,7 +64,7 @@ class Controller extends ContainerAware
      * @param string  $url The URL to redirect to
      * @param integer $status The status code to use for the Response
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     * @return RedirectResponse
      */
     public function redirect($url, $status = 302)
     {
@@ -89,9 +89,9 @@ class Controller extends ContainerAware
      *
      * @param string   $view The view name
      * @param array    $parameters An array of parameters to pass to the view
-     * @param \Symfony\Component\HttpFoundation\Response $response A response instance
+     * @param Response $response A response instance
      *
-     * @return \Symfony\Component\HttpFoundation\Response A Response instance
+     * @return Response A Response instance
      */
     public function render($view, array $parameters = array(), Response $response = null)
     {
@@ -105,8 +105,6 @@ class Controller extends ContainerAware
      *
      *     throw $this->createNotFoundException('Page not found!');
      *
-     * @param string $message
-     * @param \Exception|null $previous
      * @return NotFoundHttpException
      */
     public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
@@ -121,7 +119,7 @@ class Controller extends ContainerAware
      * @param mixed $data                       The initial data for the form
      * @param array $options                    Options for the form
      *
-     * @return \Symfony\Component\Form\Form
+     * @return Form
      */
     public function createForm($type, $data = null, array $options = array())
     {
@@ -134,7 +132,7 @@ class Controller extends ContainerAware
      * @param mixed $data               The initial data for the form
      * @param array $options            Options for the form
      *
-     * @return \Symfony\Component\Form\FormBuilder
+     * @return FormBuilder
      */
     public function createFormBuilder($data = null, array $options = array())
     {
@@ -144,7 +142,7 @@ class Controller extends ContainerAware
     /**
      * Shortcut to return the request service.
      *
-     * @return \Symfony\Component\HttpFoundation\Request
+     * @return Request
      */
     public function getRequest()
     {
@@ -154,7 +152,7 @@ class Controller extends ContainerAware
     /**
      * Shortcut to return the Doctrine Registry service.
      *
-     * @return \Symfony\Bundle\DoctrineBundle\Registry
+     * @return Registry
      *
      * @throws \LogicException If DoctrineBundle is not available
      */

src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php

@@ -32,7 +32,7 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase
      * @param array   $options An array of options to pass to the createKernel class
      * @param array   $server  An array of server parameters
      *
-     * @return \Symfony\Bundle\FrameworkBundle\Client A Client instance
+     * @return Client A Client instance
      */
     static protected function createClient(array $options = array(), array $server = array())
     {

src/Symfony/Component/Console/Command/Command.php

@@ -107,7 +107,7 @@ class Command
     /**
      * Gets the application instance for this command.
      *
-     * @return \Symfony\Component\Console\Application An Application instance
+     * @return Application An Application instance
      *
      * @api
      */

src/Symfony/Component/HttpKernel/Event/KernelEvent.php

@@ -65,7 +65,7 @@ class KernelEvent extends Event
     /**
      * Returns the request the kernel is currently processing
      *
-     * @return \Symfony\Component\HttpFoundation\Request
+     * @return Symfony\Component\HttpFoundation\Request
      *
      * @api
      */

src/Symfony/Component/Routing/Router.php

@@ -198,7 +198,7 @@ class Router implements RouterInterface
     /**
      * Gets the UrlMatcher instance associated with this Router.
      *
-     * @return \Symfony\Component\Routing\Matcher\UrlMatcherInterface A UrlMatcherInterface instance
+     * @return UrlMatcherInterface A UrlMatcherInterface instance
      */
     public function getMatcher()
     {

src/Symfony/Component/Security/Acl/Model/AclProviderInterface.php

@@ -33,7 +33,7 @@ interface AclProviderInterface
      * @throws AclNotFoundException when there is no ACL
      * @param ObjectIdentityInterface $oid
      * @param array $sids
-     * @return \Symfony\Component\Security\Acl\Model\AclInterface
+     * @return AclInterface
      */
     function findAcl(ObjectIdentityInterface $oid, array $sids = array());
 

src/Symfony/Component/Security/Acl/Model/EntryInterface.php

@@ -24,7 +24,7 @@ interface EntryInterface extends \Serializable
     /**
      * The ACL this ACE is associated with.
      *
-     * @return \Symfony\Component\Security\Acl\Model\AclInterface
+     * @return AclInterface
      */
     function getAcl();
 
@@ -45,7 +45,7 @@ interface EntryInterface extends \Serializable
     /**
      * The security identity associated with this ACE
      *
-     * @return \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface
+     * @return SecurityIdentityInterface
      */
     function getSecurityIdentity();
 

src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php

@@ -23,8 +23,8 @@ interface MutableAclProviderInterface extends AclProviderInterface
      *
      * @throws AclAlreadyExistsException when there already is an ACL for the given
      *                                   object identity
-     * @param \Symfony\Component\Security\Acl\Model\ObjectIdentityInterface $oid
-     * @return \Symfony\Component\Security\Acl\Model\AclInterface
+     * @param ObjectIdentityInterface $oid
+     * @return AclInterface
      */
     function createAcl(ObjectIdentityInterface $oid);