orocrm / platform

src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php

Doc Comments +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
      * @param SID    $sid
      * @param string $className
      *
-     * @return ArrayCollection|AclPrivilege[]
+     * @return ArrayCollection
      */
     public function getClassFieldsPrivileges(SID $sid, $className)
     {
@@ -156,7 +156,7 @@ 
      *
      * @param SID $sid
      *
-     * @return ArrayCollection|AclPrivilege[]
+     * @return ArrayCollection
      */
     public function getPrivileges(SID $sid)
     {
@@ -268,7 +268,7 @@ 
      * Associates privileges with the given security identity.
      *
      * @param SID $sid
-     * @param ArrayCollection|AclPrivilege[] $privileges
+     * @param ArrayCollection $privileges
      * @throws \RuntimeException
      *
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -380,7 +380,7 @@ 
      * @param array $context
      * @param array $rootKeys
      * @param SID $sid
-     * @param ArrayCollection|AclPrivilege[] $privileges
+     * @param ArrayCollection $privileges
      */
     protected function initSaveContext(array &$context, array $rootKeys, SID $sid, ArrayCollection $privileges)
     {
@@ -585,7 +585,7 @@ 
      * Sorts the given privileges by name in alphabetical order.
      * The root privilege is moved at the top of the list.
      *
-     * @param ArrayCollection|AclPrivilege[] $privileges [input/output]
+     * @param ArrayCollection $privileges [input/output]
      */
     protected function sortPrivileges(ArrayCollection &$privileges)
     {

Unused Use Statements +1 added lines, -4 removed lines

@@ -4,15 +4,12 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Bundle\DoctrineBundle\Registry;
-
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
+use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID;
 use Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException;
 use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface as SID;
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID;
 use Symfony\Component\Security\Acl\Model\EntryInterface;
 use Symfony\Component\Security\Acl\Model\AclInterface;
 use Symfony\Component\Translation\TranslatorInterface;
-
 use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory;
 use Oro\Bundle\SecurityBundle\Acl\AccessLevel;
 use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder;

src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php

Doc Comments +3 added lines, -3 removed lines

@@ -280,7 +280,7 @@ 
     }
 
     /**
-     * @param ArrayCollection|AclPrivilege[] $sortedPrivileges
+     * @param ArrayCollection $sortedPrivileges
      * @param array $config
      */
     protected function applyOptions(ArrayCollection $sortedPrivileges, array $config)
@@ -310,7 +310,7 @@ 
      * @param AbstractRole $role
      * @param null|string  $className
      *
-     * @return ArrayCollection|\Oro\Bundle\SecurityBundle\Model\AclPrivilege[]
+     * @return ArrayCollection
      */
     protected function getRolePrivileges(AbstractRole $role, $className = null)
     {
@@ -378,7 +378,7 @@ 
      * @param ArrayCollection $privileges
      * @param array           $rootIds
      *
-     * @return ArrayCollection|AclPrivilege[]
+     * @return ArrayCollection
      */
     protected function filterPrivileges(ArrayCollection $privileges, array $rootIds)
     {

src/Oro/Bundle/UserBundle/Tests/Functional/ControllersRoleTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
      *
      * @param string $entityLink
      *
-     * @return Crawler
+     * @return string
      */
     public function testRoleEntityFields($entityLink)
     {