@@ -29,7 +29,7 @@ |
||
29 | 29 | * @param \Twig_Environment $environment |
30 | 30 | * @param string $skypeUserName |
31 | 31 | * @param array $options |
32 | - * @return int |
|
32 | + * @return string |
|
33 | 33 | */ |
34 | 34 | public function getSkypeButton(\Twig_Environment $environment, $skypeUserName, $options = array()) |
35 | 35 | { |
@@ -5,9 +5,7 @@ |
||
5 | 5 | use Symfony\Component\Routing\RouterInterface; |
6 | 6 | use Symfony\Component\Translation\TranslatorInterface; |
7 | 7 | use Symfony\Component\Validator\Exception\InvalidArgumentException; |
8 | - |
|
9 | 8 | use Knp\Menu\MenuItem; |
10 | - |
|
11 | 9 | use Oro\Bundle\NavigationBundle\Twig\MenuExtension; |
12 | 10 | use Oro\Bundle\SecurityBundle\SecurityFacade; |
13 | 11 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\UIBundle\Twig; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Request; |
6 | - |
|
7 | 6 | use Twig_Environment; |
8 | 7 | |
9 | 8 | class WidgetExtension extends \Twig_Extension |
@@ -223,7 +223,7 @@ |
||
223 | 223 | * @param string $name |
224 | 224 | * @param object|array $item |
225 | 225 | * |
226 | - * @return mixed |
|
226 | + * @return \Oro\Bundle\AttachmentBundle\Entity\File |
|
227 | 227 | */ |
228 | 228 | protected function getPropertyValue($name, $item) |
229 | 229 | { |
@@ -5,10 +5,8 @@ |
||
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\Query; |
7 | 7 | use Doctrine\ORM\QueryBuilder; |
8 | - |
|
9 | 8 | use Symfony\Component\Security\Core\User\UserInterface; |
10 | 9 | use Symfony\Component\Security\Core\SecurityContextInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\AttachmentBundle\Manager\AttachmentManager; |
13 | 11 | use Oro\Bundle\EntityBundle\Provider\EntityNameResolver; |
14 | 12 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
@@ -15,7 +15,7 @@ |
||
15 | 15 | /** |
16 | 16 | * @param SecurityFacade $securityFacade |
17 | 17 | * @param AttachmentManager $attachmentManager |
18 | - * @param array $userEntityName |
|
18 | + * @param string $userEntityName |
|
19 | 19 | * @param array $properties |
20 | 20 | */ |
21 | 21 | public function __construct( |
@@ -5,13 +5,10 @@ |
||
5 | 5 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
6 | 6 | use FOS\RestBundle\Routing\ClassResourceInterface; |
7 | 7 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
8 | - |
|
9 | 8 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
10 | - |
|
11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
13 | 11 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
14 | - |
|
15 | 12 | use Oro\Bundle\UserBundle\Entity\Role; |
16 | 13 | |
17 | 14 | /** |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use FOS\RestBundle\Routing\ClassResourceInterface; |
8 | 8 | use FOS\RestBundle\Util\Codes; |
9 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
10 | - |
|
11 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
12 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
13 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -318,6 +318,7 @@ |
||
318 | 318 | |
319 | 319 | /** |
320 | 320 | * {@inheritdoc} |
321 | + * @param User $entity |
|
321 | 322 | */ |
322 | 323 | protected function getPreparedItem($entity, $resultFields = []) |
323 | 324 | { |
@@ -3,26 +3,20 @@ |
||
3 | 3 | namespace Oro\Bundle\UserBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\Form\FormInterface; |
6 | - |
|
7 | 6 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
8 | - |
|
9 | 7 | use FOS\RestBundle\Util\Codes; |
10 | 8 | use FOS\RestBundle\Routing\ClassResourceInterface; |
11 | 9 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
12 | 10 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
13 | - |
|
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
15 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
16 | - |
|
17 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
18 | 14 | use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; |
19 | 15 | use Oro\Bundle\SoapBundle\Form\Handler\ApiFormHandler; |
20 | - |
|
21 | 16 | use Oro\Bundle\UserBundle\Entity\User; |
22 | 17 | use Oro\Bundle\UserBundle\Entity\Role; |
23 | 18 | use Oro\Bundle\UserBundle\Entity\Group; |
24 | 19 | use Oro\Bundle\UserBundle\Entity\Email; |
25 | - |
|
26 | 20 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
27 | 21 | |
28 | 22 | /** |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\UserBundle\Controller\Api\Soap; |
4 | 4 | |
5 | 5 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
6 | - |
|
7 | 6 | use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapController; |
8 | 7 | use Oro\Bundle\UserBundle\Entity\Role; |
9 | 8 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |