Merge pull request #276 from symfony-cmf/analysis-XVjgKK

Apply fixes from StyleCI

Author: ElectricMaxxx

DependencyInjection/CmfMenuExtension.php

@@ -12,7 +12,6 @@
 namespace Symfony\Cmf\Bundle\MenuBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;

DependencyInjection/Compiler/DecorateMenuFactoryPass.php

@@ -21,7 +21,7 @@ class DecorateMenuFactoryPass implements CompilerPassInterface
      * {@inheritdoc}
      *
      * @todo Add `decorates="knp_menu.factory"` to the service definition
-     *       instead if Symfony 2.3 support is dropped.
+     *       instead if Symfony 2.3 support is dropped
      */
     public function process(ContainerBuilder $container)
     {

Doctrine/Phpcr/Menu.php

@@ -20,7 +20,7 @@ class Menu extends ModelMenu implements HierarchyInterface
     /**
      * Set the parent of this menu.
      *
-     * @param object $parent A mapped document.
+     * @param object $parent A mapped document
      *
      * @return Menu - this instance
      */
@@ -42,7 +42,7 @@ public function getParentDocument()
     /**
      * Convenience method to set parent and name at the same time.
      *
-     * @param object $parent A mapped object.
+     * @param object $parent A mapped object
      * @param string $name
      *
      * @return Menu - this instance
@@ -60,7 +60,7 @@ public function setPosition($parent, $name)
      *
      * @param NodeInterface $child
      *
-     * @return NodeInterface - The newly added child node.
+     * @return NodeInterface - The newly added child node
      */
     public function addChild(NodeInterface $child)
     {

Doctrine/Phpcr/MenuNode.php

@@ -20,7 +20,7 @@ class MenuNode extends ModelMenuNode implements HierarchyInterface
     /**
      * Set the parent of this menu node.
      *
-     * @param object $parent A mapped document.
+     * @param object $parent A mapped document
      *
      * @return MenuNode - this instance
      */
@@ -42,7 +42,7 @@ public function getParentDocument()
     /**
      * Convenience method to set parent and name at the same time.
      *
-     * @param object $parent A mapped document.
+     * @param object $parent A mapped document
      * @param string $name
      *
      * @return MenuNode - this instance
@@ -60,7 +60,7 @@ public function setPosition($parent, $name)
      *
      * @param NodeInterface $child
      *
-     * @return NodeInterface - The newly added child node.
+     * @return NodeInterface - The newly added child node
      */
     public function addChild(NodeInterface $child)
     {

Event/CreateMenuItemFromNodeEvent.php

@@ -88,7 +88,7 @@ public function getItem()
      * will still be built and added after eventual children this menu item
      * has.
      *
-     * @param ItemInterface $item Menu item to use.
+     * @param ItemInterface $item Menu item to use
      */
     public function setItem(ItemInterface $item = null)
     {
@@ -111,7 +111,7 @@ public function setSkipNode($skipNode)
     }
 
     /**
-     * @return bool Whether the node associated to this event is to be skipped.
+     * @return bool Whether the node associated to this event is to be skipped
      */
     public function isSkipNode()
     {
@@ -136,7 +136,7 @@ public function setSkipChildren($skipChildren)
 
     /**
      * @return bool Whether the children of the node associated to this event
-     *              should be handled or ignored.
+     *              should be handled or ignored
      */
     public function isSkipChildren()
     {

Model/MenuNodeBase.php

@@ -367,7 +367,7 @@ public function getChildren()
      *
      * @param NodeInterface $child
      *
-     * @return NodeInterface The newly added child node.
+     * @return NodeInterface The newly added child node
      */
     public function addChild(NodeInterface $child)
     {

Provider/PhpcrMenuProvider.php

@@ -133,7 +133,7 @@ public function setPrefetch($depth)
     /**
      * Get the depth to use. A depth <= 0 means no prefetching should be done.
      *
-     * @return int The depth to use when fetching menus.
+     * @return int The depth to use when fetching menus
      */
     public function getPrefetch()
     {
@@ -158,12 +158,12 @@ public function setRequest(Request $request = null)
      * only load a submenu rather than a whole menu.
      *
      * @param string $name    Name of the menu to load. This can be an
-     *                        absolute PHPCR path or one relative to the menu root.
+     *                        absolute PHPCR path or one relative to the menu root
      * @param array  $options
      *
-     * @return ItemInterface The menu (sub)tree starting with name.
+     * @return ItemInterface The menu (sub)tree starting with name
      *
-     * @throws \InvalidArgumentException if the menu can not be found.
+     * @throws \InvalidArgumentException if the menu can not be found
      */
     public function get($name, array $options = array())
     {
@@ -184,10 +184,10 @@ public function get($name, array $options = array())
      * an exception.
      *
      * @param string $name    Name of the menu to load. This can be an
-     *                        absolute PHPCR path or one relative to the menu root.
+     *                        absolute PHPCR path or one relative to the menu root
      * @param array  $options
      *
-     * @return bool Whether a menu with this name can be loaded by this provider.
+     * @return bool Whether a menu with this name can be loaded by this provider
      */
     public function has($name, array $options = array())
     {
@@ -199,13 +199,13 @@ public function has($name, array $options = array())
      * @param array  $options
      * @param bool   $throw   Whether to throw an exception if the menu is not
      *                        found or no valid menu. Returns false if $throw is false and there
-     *                        is no menu at $name.
+     *                        is no menu at $name
      *
      * @return object|bool The menu root found with $name or false if $throw
-     *                     is false and the menu was not found.
+     *                     is false and the menu was not found
      *
      * @throws \InvalidArgumentException Only if $throw is true throws this
-     *                                   exception if the name is empty or no menu found.
+     *                                   exception if the name is empty or no menu found
      */
     protected function find($name, array $options, $throw)
     {

PublishWorkflow/CreateMenuItemFromNodeListener.php

@@ -36,8 +36,8 @@ class CreateMenuItemFromNodeListener
     private $publishWorkflowPermission;
 
     /**
-     * @param AuthorizationCheckerInterface $publishWorkflowChecker The publish workflow checker.
-     * @param string                        $attribute              The permission to check.
+     * @param AuthorizationCheckerInterface $publishWorkflowChecker The publish workflow checker
+     * @param string                        $attribute              The permission to check
      */
     public function __construct(AuthorizationCheckerInterface $publishWorkflowChecker, $attribute = PublishWorkflowChecker::VIEW_ATTRIBUTE)
     {

PublishWorkflow/Voter/MenuContentVoter.php

@@ -27,7 +27,7 @@ class MenuContentVoter implements VoterInterface
     /**
      * @param ContainerInterface $container to get the publish workflow checker
      *                                      from. We cannot inject the publish workflow checker directly as
-     *                                      this would lead to a circular reference.
+     *                                      this would lead to a circular reference
      */
     public function __construct(ContainerInterface $container)
     {

QuietFactory.php

@@ -83,7 +83,7 @@ public function createItem($name, array $options = array())
      * @param ExtensionInterface $extension
      * @param int                $priority
      *
-     * @throws \Exception if the inner factory does not implement the addExtension method.
+     * @throws \Exception if the inner factory does not implement the addExtension method
      */
     public function addExtension(ExtensionInterface $extension, $priority = 0)
     {