Skip to content

Commit

Permalink
expanded namespaces within phpdoc (special for PhpStorm)
Browse files Browse the repository at this point in the history
  • Loading branch information
realmfoo committed Aug 10, 2011
1 parent f0a6ee5 commit 6e7439e
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 18 deletions.
Expand Up @@ -28,10 +28,13 @@
abstract class ContainerAwareCommand extends Command implements ContainerAwareInterface
{
/**
* @var ContainerInterface
* @var \Symfony\Component\DependencyInjection\ContainerInterface
*/
private $container;

/**
* @return \Symfony\Component\DependencyInjection\ContainerInterface
*/
protected function getContainer()
{
if (null === $this->container) {
Expand Down
18 changes: 10 additions & 8 deletions src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
Expand Up @@ -51,7 +51,7 @@ public function generateUrl($route, $parameters = array(), $absolute = false)
* @param array $path An array of path parameters
* @param array $query An array of query parameters
*
* @return Response A Response instance
* @return \Symfony\Component\HttpFoundation\Response A Response instance
*/
public function forward($controller, array $path = array(), array $query = array())
{
Expand All @@ -64,7 +64,7 @@ public function forward($controller, array $path = array(), array $query = array
* @param string $url The URL to redirect to
* @param integer $status The status code to use for the Response
*
* @return RedirectResponse
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function redirect($url, $status = 302)
{
Expand All @@ -89,9 +89,9 @@ public function renderView($view, array $parameters = array())
*
* @param string $view The view name
* @param array $parameters An array of parameters to pass to the view
* @param Response $response A response instance
* @param \Symfony\Component\HttpFoundation\Response $response A response instance
*
* @return Response A Response instance
* @return \Symfony\Component\HttpFoundation\Response A Response instance
*/
public function render($view, array $parameters = array(), Response $response = null)
{
Expand All @@ -105,6 +105,8 @@ public function render($view, array $parameters = array(), Response $response =
*
* throw $this->createNotFoundException('Page not found!');
*
* @param string $message
* @param \Exception|null $previous
* @return NotFoundHttpException
*/
public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
Expand All @@ -119,7 +121,7 @@ public function createNotFoundException($message = 'Not Found', \Exception $prev
* @param mixed $data The initial data for the form
* @param array $options Options for the form
*
* @return Form
* @return \Symfony\Component\Form\Form
*/
public function createForm($type, $data = null, array $options = array())
{
Expand All @@ -132,7 +134,7 @@ public function createForm($type, $data = null, array $options = array())
* @param mixed $data The initial data for the form
* @param array $options Options for the form
*
* @return FormBuilder
* @return \Symfony\Component\Form\FormBuilder
*/
public function createFormBuilder($data = null, array $options = array())
{
Expand All @@ -142,7 +144,7 @@ public function createFormBuilder($data = null, array $options = array())
/**
* Shortcut to return the request service.
*
* @return Request
* @return \Symfony\Component\HttpFoundation\Request
*/
public function getRequest()
{
Expand All @@ -152,7 +154,7 @@ public function getRequest()
/**
* Shortcut to return the Doctrine Registry service.
*
* @return Registry
* @return \Symfony\Bundle\DoctrineBundle\Registry
*
* @throws \LogicException If DoctrineBundle is not available
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
Expand Up @@ -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 Client A Client instance
* @return \Symfony\Bundle\FrameworkBundle\Client A Client instance
*/
static protected function createClient(array $options = array(), array $server = array())
{
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Console/Command/Command.php
Expand Up @@ -107,7 +107,7 @@ public function getHelperSet()
/**
* Gets the application instance for this command.
*
* @return Application An Application instance
* @return \Symfony\Component\Console\Application An Application instance
*
* @api
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/HttpKernel/Event/KernelEvent.php
Expand Up @@ -65,7 +65,7 @@ public function getKernel()
/**
* Returns the request the kernel is currently processing
*
* @return Symfony\Component\HttpFoundation\Request
* @return \Symfony\Component\HttpFoundation\Request
*
* @api
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Routing/Router.php
Expand Up @@ -198,7 +198,7 @@ public function match($url)
/**
* Gets the UrlMatcher instance associated with this Router.
*
* @return UrlMatcherInterface A UrlMatcherInterface instance
* @return \Symfony\Component\Routing\Matcher\UrlMatcherInterface A UrlMatcherInterface instance
*/
public function getMatcher()
{
Expand Down
Expand Up @@ -33,7 +33,7 @@ function findChildren(ObjectIdentityInterface $parentOid, $directChildrenOnly =
* @throws AclNotFoundException when there is no ACL
* @param ObjectIdentityInterface $oid
* @param array $sids
* @return AclInterface
* @return \Symfony\Component\Security\Acl\Model\AclInterface
*/
function findAcl(ObjectIdentityInterface $oid, array $sids = array());

Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Component/Security/Acl/Model/EntryInterface.php
Expand Up @@ -24,7 +24,7 @@ interface EntryInterface extends \Serializable
/**
* The ACL this ACE is associated with.
*
* @return AclInterface
* @return \Symfony\Component\Security\Acl\Model\AclInterface
*/
function getAcl();

Expand All @@ -45,7 +45,7 @@ function getMask();
/**
* The security identity associated with this ACE
*
* @return SecurityIdentityInterface
* @return \Symfony\Component\Security\Acl\Model\SecurityIdentityInterface
*/
function getSecurityIdentity();

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

Expand Down

0 comments on commit 6e7439e

Please sign in to comment.