@@ -10,7 +10,6 @@ |
||
10 | 10 | use Symfony\Component\Form\FormView; |
11 | 11 | use Symfony\Component\HttpFoundation\Request; |
12 | 12 | use Symfony\Component\OptionsResolver\OptionsResolver; |
13 | - |
|
14 | 13 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
15 | 14 | use Oro\Bundle\EntityBundle\ORM\EntityAliasResolver; |
16 | 15 | use Oro\Bundle\EntityBundle\Tools\EntityRoutingHelper; |
@@ -3,7 +3,6 @@ discard block |
||
3 | 3 | namespace Oro\Bundle\ActivityBundle\Form\Type; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Symfony\Component\Form\AbstractType; |
8 | 7 | use Symfony\Component\Form\FormBuilderInterface; |
9 | 8 | use Symfony\Component\Form\FormInterface; |
@@ -12,7 +11,6 @@ discard block |
||
12 | 11 | use Symfony\Component\OptionsResolver\OptionsResolver; |
13 | 12 | use Symfony\Component\Translation\TranslatorInterface; |
14 | 13 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
15 | - |
|
16 | 14 | use Oro\Bundle\ActivityBundle\Form\DataTransformer\ContextsToViewTransformer; |
17 | 15 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
18 | 16 | use Oro\Bundle\SearchBundle\Engine\ObjectMapper; |
@@ -3,9 +3,7 @@ |
||
3 | 3 | namespace Oro\Bundle\ActivityBundle\Migration\Extension; |
4 | 4 | |
5 | 5 | use Doctrine\DBAL\Schema\Schema; |
6 | - |
|
7 | 6 | use Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope; |
8 | -use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; |
|
9 | 7 | use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtension; |
10 | 8 | use Oro\Bundle\EntityExtendBundle\Migration\Extension\ExtendExtensionAwareInterface; |
11 | 9 | use Oro\Bundle\EntityExtendBundle\Migration\OroOptions; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * The real implementation of this method is auto generated. |
51 | 51 | * |
52 | 52 | * @param object $target Any configurable entity that can be associated with this activity |
53 | - * @return object This object |
|
53 | + * @return ExtendActivity This object |
|
54 | 54 | */ |
55 | 55 | public function addActivityTarget($target) |
56 | 56 | { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | * The real implementation of this method is auto generated. |
64 | 64 | * |
65 | 65 | * @param object $target Any configurable entity that can be associated with this activity |
66 | - * @return object This object |
|
66 | + * @return ExtendActivity This object |
|
67 | 67 | */ |
68 | 68 | public function removeActivityTarget($target) |
69 | 69 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\ActivityBundle\Provider; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | - |
|
7 | 6 | use Oro\Bundle\ActivityBundle\Manager\ActivityManager; |
8 | 7 | use Oro\Bundle\UIBundle\Placeholder\PlaceholderProvider; |
9 | 8 | use Oro\Bundle\UIBundle\Provider\WidgetProviderInterface; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Annotations\AnnotationReader; |
6 | 6 | use Doctrine\ORM\Mapping\Driver\AnnotationDriver; |
7 | - |
|
8 | 7 | use Oro\Bundle\ActivityBundle\EntityConfig\ActivityScope; |
9 | 8 | use Oro\Bundle\ActivityBundle\Event\Events; |
10 | 9 | use Oro\Bundle\ActivityBundle\Manager\ActivityManager; |
@@ -3,15 +3,12 @@ |
||
3 | 3 | namespace Oro\Bundle\ActivityListBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Util\Codes; |
8 | 7 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
9 | 8 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
10 | 9 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
11 | - |
|
12 | 10 | use Symfony\Component\HttpFoundation\JsonResponse; |
13 | 11 | use Symfony\Component\HttpFoundation\Response; |
14 | - |
|
15 | 12 | use Oro\Bundle\ActivityListBundle\Provider\ActivityListChainProvider; |
16 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
17 | 14 |
@@ -499,7 +499,7 @@ |
||
499 | 499 | } |
500 | 500 | |
501 | 501 | /** |
502 | - * @param $relatedActivityClass |
|
502 | + * @param string $relatedActivityClass |
|
503 | 503 | * |
504 | 504 | * @return self |
505 | 505 | */ |
@@ -3,13 +3,10 @@ |
||
3 | 3 | namespace Oro\Bundle\ActivityListBundle\Entity; |
4 | 4 | |
5 | 5 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
6 | - |
|
7 | 6 | use Doctrine\ORM\Mapping as ORM; |
8 | 7 | use Doctrine\Common\Collections\ArrayCollection; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; |
11 | 9 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField; |
12 | - |
|
13 | 10 | use Oro\Bundle\ActivityListBundle\Model\ExtendActivityList; |
14 | 11 | use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; |
15 | 12 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\ActivityListBundle\Entity; |
4 | 4 | |
5 | 5 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
6 | - |
|
7 | 6 | use Doctrine\ORM\Mapping as ORM; |
8 | 7 | use Doctrine\Common\Collections\Criteria; |
9 | - |
|
10 | 8 | use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; |
11 | 9 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
12 | 10 | use Oro\Bundle\UserBundle\Entity\User; |