From 3fadd3a1e99683d82a3c580924b15397f3de2547 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Mon, 18 Jun 2012 00:31:13 +0200 Subject: [PATCH] Fixed class names in the phpdoc --- src/Knp/Menu/Matcher/Matcher.php | 11 ++++++++--- src/Knp/Menu/Matcher/MatcherInterface.php | 4 ++-- src/Knp/Menu/Matcher/Voter/UriVoter.php | 2 +- src/Knp/Menu/Matcher/Voter/VoterInterface.php | 2 +- src/Knp/Menu/Renderer/ListRenderer.php | 2 +- src/Knp/Menu/Renderer/TwigRenderer.php | 2 +- src/Knp/Menu/Silex/Voter/RouteVoter.php | 4 ++-- .../Knp/Menu/Tests/Renderer/AbstractRendererTest.php | 2 +- 8 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/Knp/Menu/Matcher/Matcher.php b/src/Knp/Menu/Matcher/Matcher.php index 159990df..dacb3bb3 100644 --- a/src/Knp/Menu/Matcher/Matcher.php +++ b/src/Knp/Menu/Matcher/Matcher.php @@ -13,7 +13,7 @@ class Matcher implements MatcherInterface private $cache; /** - * @var \Knp\Menu\Matcher\Voter\VoterInterface[] + * @var VoterInterface[] */ private $voters = array(); @@ -22,6 +22,11 @@ public function __construct() $this->cache = new \SplObjectStorage(); } + /** + * Adds a voter in the matcher. + * + * @param VoterInterface $voter + */ public function addVoter(VoterInterface $voter) { $this->voters[] = $voter; @@ -30,7 +35,7 @@ public function addVoter(VoterInterface $voter) /** * Checks whether an item is current. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @return boolean */ public function isCurrent(ItemInterface $item) @@ -60,7 +65,7 @@ public function isCurrent(ItemInterface $item) /** * Checks whether an item is the ancestor of a current item. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @param integer $depth The max depth to look for the item * @return boolean */ diff --git a/src/Knp/Menu/Matcher/MatcherInterface.php b/src/Knp/Menu/Matcher/MatcherInterface.php index b841724d..916a5a4c 100644 --- a/src/Knp/Menu/Matcher/MatcherInterface.php +++ b/src/Knp/Menu/Matcher/MatcherInterface.php @@ -12,7 +12,7 @@ interface MatcherInterface /** * Checks whether an item is current. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @return boolean */ function isCurrent(ItemInterface $item); @@ -20,7 +20,7 @@ function isCurrent(ItemInterface $item); /** * Checks whether an item is the ancestor of a current item. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @param integer $depth The max depth to look for the item * @return boolean */ diff --git a/src/Knp/Menu/Matcher/Voter/UriVoter.php b/src/Knp/Menu/Matcher/Voter/UriVoter.php index 126897e7..d828e449 100644 --- a/src/Knp/Menu/Matcher/Voter/UriVoter.php +++ b/src/Knp/Menu/Matcher/Voter/UriVoter.php @@ -22,7 +22,7 @@ public function setUri($uri) * If the voter is not able to determine a result, * it should return null to let other voters do the job. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @return boolean|null */ public function matchItem(ItemInterface $item) diff --git a/src/Knp/Menu/Matcher/Voter/VoterInterface.php b/src/Knp/Menu/Matcher/Voter/VoterInterface.php index d92707e4..6867f883 100644 --- a/src/Knp/Menu/Matcher/Voter/VoterInterface.php +++ b/src/Knp/Menu/Matcher/Voter/VoterInterface.php @@ -15,7 +15,7 @@ interface VoterInterface * If the voter is not able to determine a result, * it should return null to let other voters do the job. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @return boolean|null */ function matchItem(ItemInterface $item); diff --git a/src/Knp/Menu/Renderer/ListRenderer.php b/src/Knp/Menu/Renderer/ListRenderer.php index faae73fb..7b6c1f0a 100644 --- a/src/Knp/Menu/Renderer/ListRenderer.php +++ b/src/Knp/Menu/Renderer/ListRenderer.php @@ -14,7 +14,7 @@ class ListRenderer extends Renderer implements RendererInterface private $defaultOptions; /** - * @param \Knp\Menu\Matcher\MatcherInterface $matcher + * @param MatcherInterface $matcher * @param array $defaultOptions * @param string $charset */ diff --git a/src/Knp/Menu/Renderer/TwigRenderer.php b/src/Knp/Menu/Renderer/TwigRenderer.php index 58ccf74e..9a96b93d 100644 --- a/src/Knp/Menu/Renderer/TwigRenderer.php +++ b/src/Knp/Menu/Renderer/TwigRenderer.php @@ -17,7 +17,7 @@ class TwigRenderer implements RendererInterface /** * @param \Twig_Environment $environment * @param string $template - * @param \Knp\Menu\Matcher\MatcherInterface $matcher + * @param MatcherInterface $matcher * @param array $defaultOptions */ public function __construct(\Twig_Environment $environment, $template, MatcherInterface $matcher, array $defaultOptions = array()) diff --git a/src/Knp/Menu/Silex/Voter/RouteVoter.php b/src/Knp/Menu/Silex/Voter/RouteVoter.php index bf620920..fbf73e01 100644 --- a/src/Knp/Menu/Silex/Voter/RouteVoter.php +++ b/src/Knp/Menu/Silex/Voter/RouteVoter.php @@ -12,7 +12,7 @@ class RouteVoter implements VoterInterface { /** - * @var \Symfony\Component\HttpFoundation\Request + * @var Request */ private $request; @@ -27,7 +27,7 @@ public function setRequest(Request $request) * If the voter is not able to determine a result, * it should return null to let other voters do the job. * - * @param \Knp\Menu\ItemInterface $item + * @param ItemInterface $item * @return boolean|null */ public function matchItem(ItemInterface $item) diff --git a/tests/Knp/Menu/Tests/Renderer/AbstractRendererTest.php b/tests/Knp/Menu/Tests/Renderer/AbstractRendererTest.php index a2c3016e..5f00195a 100644 --- a/tests/Knp/Menu/Tests/Renderer/AbstractRendererTest.php +++ b/tests/Knp/Menu/Tests/Renderer/AbstractRendererTest.php @@ -16,7 +16,7 @@ abstract class AbstractRendererTest extends TestCase protected $renderer; /** - * @var \Knp\Menu\Matcher\MatcherInterface + * @var MatcherInterface */ private $matcher;