@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | /** |
44 | 44 | * Register new token parser |
45 | 45 | * |
46 | - * @return array |
|
46 | + * @return TitleSetTokenParser[] |
|
47 | 47 | */ |
48 | 48 | public function getTokenParsers() |
49 | 49 | { |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Renders title |
57 | 57 | * |
58 | - * @param null $titleData |
|
59 | - * @return string |
|
58 | + * @param string $titleData |
|
59 | + * @return TitleServiceInterface |
|
60 | 60 | */ |
61 | 61 | public function render($titleData = null) |
62 | 62 | { |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | /** |
69 | 69 | * Renders short title |
70 | 70 | * |
71 | - * @param null $titleData |
|
72 | - * @return string |
|
71 | + * @param string $titleData |
|
72 | + * @return TitleServiceInterface |
|
73 | 73 | */ |
74 | 74 | public function renderShort($titleData = null) |
75 | 75 | { |
@@ -3,16 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\NoteBundle\Controller\Api\Soap; |
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormInterface; |
6 | - |
|
7 | 6 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
8 | - |
|
9 | -use Oro\Bundle\SecurityBundle\Annotation\Acl; |
|
10 | 7 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
11 | - |
|
12 | 8 | use Oro\Bundle\EntityBundle\Model\EntityIdSoap; |
13 | - |
|
14 | 9 | use Oro\Bundle\NoteBundle\Entity\Repository\NoteRepository; |
15 | - |
|
16 | 10 | use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; |
17 | 11 | use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapController; |
18 | 12 | use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; |
@@ -3,16 +3,11 @@ |
||
3 | 3 | namespace Oro\Bundle\NoteBundle\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Component\Security\Core\Util\ClassUtils; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Util\Codes; |
8 | - |
|
9 | 7 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
10 | -use Symfony\Bundle\FrameworkBundle\Routing\Router; |
|
11 | 8 | use Symfony\Component\HttpFoundation\Response; |
12 | - |
|
13 | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
14 | 10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
15 | - |
|
16 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
17 | 12 | use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper; |
18 | 13 | use Oro\Bundle\NoteBundle\Entity\Note; |
@@ -47,7 +47,7 @@ |
||
47 | 47 | * |
48 | 48 | * @param object $target Any configurable entity that can have notes |
49 | 49 | * |
50 | - * @return object This object |
|
50 | + * @return ExtendNote This object |
|
51 | 51 | */ |
52 | 52 | public function setTarget($target) |
53 | 53 | { |
@@ -62,7 +62,7 @@ |
||
62 | 62 | * Checks if command is already queued. |
63 | 63 | * |
64 | 64 | * @param string $command |
65 | - * @return Job |
|
65 | + * @return boolean |
|
66 | 66 | */ |
67 | 67 | protected function hasNotFinishedJob($command) |
68 | 68 | { |
@@ -4,16 +4,13 @@ |
||
4 | 4 | |
5 | 5 | use Oro\Bundle\WorkflowBundle\Model\ContextAccessor; |
6 | 6 | use Symfony\Component\Form\Test\FormIntegrationTestCase; |
7 | - |
|
8 | 7 | use Oro\Bundle\WorkflowBundle\Form\EventListener\DefaultValuesListener; |
9 | 8 | use Oro\Bundle\WorkflowBundle\Form\EventListener\InitActionsListener; |
10 | 9 | use Oro\Bundle\WorkflowBundle\Form\EventListener\RequiredAttributesListener; |
11 | 10 | use Oro\Bundle\WorkflowBundle\Form\Type\WorkflowAttributesType; |
12 | - |
|
13 | 11 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowItem; |
14 | 12 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowStep; |
15 | 13 | use Oro\Bundle\WorkflowBundle\Entity\WorkflowDefinition; |
16 | - |
|
17 | 14 | use Oro\Bundle\WorkflowBundle\Model\Step; |
18 | 15 | use Oro\Bundle\WorkflowBundle\Model\Attribute; |
19 | 16 | use Oro\Bundle\WorkflowBundle\Model\WorkflowData; |
@@ -31,6 +31,9 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected $notificationRules; |
33 | 33 | |
34 | + /** |
|
35 | + * @param string $className |
|
36 | + */ |
|
34 | 37 | public function __construct(ObjectManager $em, $className) |
35 | 38 | { |
36 | 39 | $this->handlers = array(); |
@@ -92,7 +95,7 @@ discard block |
||
92 | 95 | * |
93 | 96 | * @param string $entityName |
94 | 97 | * @param string $eventName |
95 | - * @return \Doctrine\Common\Collections\Collection|ArrayCollection |
|
98 | + * @return \Doctrine\Common\Collections\ArrayCollection |
|
96 | 99 | */ |
97 | 100 | protected function getRulesByCriteria($entityName, $eventName) |
98 | 101 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Component\PropertyAccess\Tests\Unit; |
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; |
6 | - |
|
7 | 6 | use Oro\Component\PropertyAccess\PropertyAccessor; |
8 | 7 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClass; |
9 | 8 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClassMagicCall; |
@@ -117,6 +117,10 @@ discard block |
||
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
120 | + /** |
|
121 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
122 | + * @param string $roleName |
|
123 | + */ |
|
120 | 124 | public function deleteAcl($login, $roleName, $username, $email) |
121 | 125 | { |
122 | 126 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -132,6 +136,10 @@ discard block |
||
132 | 136 | ->checkContextMenu($email, 'Delete'); |
133 | 137 | } |
134 | 138 | |
139 | + /** |
|
140 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
141 | + * @param string $roleName |
|
142 | + */ |
|
135 | 143 | public function updateAcl($login, $roleName, $username, $email) |
136 | 144 | { |
137 | 145 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -147,6 +155,10 @@ discard block |
||
147 | 155 | ->checkContextMenu($email, 'Edit'); |
148 | 156 | } |
149 | 157 | |
158 | + /** |
|
159 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
160 | + * @param string $roleName |
|
161 | + */ |
|
150 | 162 | public function createAcl($login, $roleName, $username) |
151 | 163 | { |
152 | 164 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -165,6 +177,10 @@ discard block |
||
165 | 177 | ); |
166 | 178 | } |
167 | 179 | |
180 | + /** |
|
181 | + * @param \Oro\Bundle\UserBundle\Tests\Selenium\Pages\Login $login |
|
182 | + * @param string $roleName |
|
183 | + */ |
|
168 | 184 | public function viewListAcl($login, $roleName, $username) |
169 | 185 | { |
170 | 186 | $login->openRoles('Oro\Bundle\UserBundle') |
@@ -3,13 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | -use Symfony\Component\HttpFoundation\JsonResponse; |
|
7 | 6 | use Symfony\Component\HttpFoundation\Request; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
11 | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
12 | - |
|
13 | 10 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
15 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | * @param User $user |
64 | 64 | * @param string $name |
65 | 65 | * |
66 | - * @return null|Organization |
|
66 | + * @return Organization[] |
|
67 | 67 | */ |
68 | 68 | public function getEnabledUserOrganizationByName(User $user, $name) |
69 | 69 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Component\PropertyAccess\Tests\Unit; |
4 | 4 | |
5 | 5 | use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException; |
6 | - |
|
7 | 6 | use Oro\Component\PropertyAccess\PropertyAccessor; |
8 | 7 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClass; |
9 | 8 | use Oro\Component\PropertyAccess\Tests\Unit\Fixtures\TestClassMagicCall; |