Completed
Pull Request — master (#337)
by Ivan
134:44 queued 88:24
created
src/Oro/Bundle/SecurityBundle/Acl/Persistence/AclPrivilegeRepository.php 2 patches
Doc Comments   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
      * @param SID    $sid
107 107
      * @param string $className
108 108
      *
109
-     * @return ArrayCollection|AclPrivilege[]
109
+     * @return ArrayCollection
110 110
      */
111 111
     public function getClassFieldsPrivileges(SID $sid, $className)
112 112
     {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
      *
157 157
      * @param SID $sid
158 158
      *
159
-     * @return ArrayCollection|AclPrivilege[]
159
+     * @return ArrayCollection
160 160
      */
161 161
     public function getPrivileges(SID $sid)
162 162
     {
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
      * Associates privileges with the given security identity.
269 269
      *
270 270
      * @param SID $sid
271
-     * @param ArrayCollection|AclPrivilege[] $privileges
271
+     * @param ArrayCollection $privileges
272 272
      * @throws \RuntimeException
273 273
      *
274 274
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
      * @param array $context
381 381
      * @param array $rootKeys
382 382
      * @param SID $sid
383
-     * @param ArrayCollection|AclPrivilege[] $privileges
383
+     * @param ArrayCollection $privileges
384 384
      */
385 385
     protected function initSaveContext(array &$context, array $rootKeys, SID $sid, ArrayCollection $privileges)
386 386
     {
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
585 585
      * Sorts the given privileges by name in alphabetical order.
586 586
      * The root privilege is moved at the top of the list.
587 587
      *
588
-     * @param ArrayCollection|AclPrivilege[] $privileges [input/output]
588
+     * @param ArrayCollection $privileges [input/output]
589 589
      */
590 590
     protected function sortPrivileges(ArrayCollection &$privileges)
591 591
     {
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,15 +4,12 @@
 block discarded – undo
4 4
 
5 5
 use Doctrine\Common\Collections\ArrayCollection;
6 6
 use Doctrine\Bundle\DoctrineBundle\Registry;
7
-
8
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
7
+use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID;
9 8
 use Symfony\Component\Security\Acl\Exception\NotAllAclsFoundException;
10 9
 use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface as SID;
11
-use Symfony\Component\Security\Acl\Domain\ObjectIdentity as OID;
12 10
 use Symfony\Component\Security\Acl\Model\EntryInterface;
13 11
 use Symfony\Component\Security\Acl\Model\AclInterface;
14 12
 use Symfony\Component\Translation\TranslatorInterface;
15
-
16 13
 use Oro\Bundle\SecurityBundle\Acl\Domain\ObjectIdentityFactory;
17 14
 use Oro\Bundle\SecurityBundle\Acl\AccessLevel;
18 15
 use Oro\Bundle\SecurityBundle\Acl\Permission\MaskBuilder;
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Form/Handler/AclRoleHandler.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
     }
281 281
 
282 282
     /**
283
-     * @param ArrayCollection|AclPrivilege[] $sortedPrivileges
283
+     * @param ArrayCollection $sortedPrivileges
284 284
      * @param array $config
285 285
      */
286 286
     protected function applyOptions(ArrayCollection $sortedPrivileges, array $config)
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
      * @param AbstractRole $role
311 311
      * @param null|string  $className
312 312
      *
313
-     * @return ArrayCollection|\Oro\Bundle\SecurityBundle\Model\AclPrivilege[]
313
+     * @return ArrayCollection
314 314
      */
315 315
     protected function getRolePrivileges(AbstractRole $role, $className = null)
316 316
     {
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
      * @param ArrayCollection $privileges
379 379
      * @param array           $rootIds
380 380
      *
381
-     * @return ArrayCollection|AclPrivilege[]
381
+     * @return ArrayCollection
382 382
      */
383 383
     protected function filterPrivileges(ArrayCollection $privileges, array $rootIds)
384 384
     {
Please login to merge, or discard this patch.
src/Oro/Bundle/UserBundle/Tests/Functional/ControllersRoleTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,7 @@
 block discarded – undo
121 121
      *
122 122
      * @param string $entityLink
123 123
      *
124
-     * @return Crawler
124
+     * @return string
125 125
      */
126 126
     public function testRoleEntityFields($entityLink)
127 127
     {
Please login to merge, or discard this patch.