@@ -8,11 +8,8 @@ |
||
| 8 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
| 9 | 9 | use FOS\RestBundle\Controller\Annotations\Delete; |
| 10 | 10 | use FOS\RestBundle\Controller\Annotations\Post; |
| 11 | - |
|
| 12 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 13 | - |
|
| 14 | 12 | use Symfony\Component\HttpFoundation\Response; |
| 15 | - |
|
| 16 | 13 | use Oro\Bundle\ActivityBundle\Entity\Manager\ActivityEntityApiEntityManager; |
| 17 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
| 18 | 15 | use Oro\Bundle\SoapBundle\Model\RelationIdentifier; |
@@ -6,11 +6,8 @@ |
||
| 6 | 6 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
| 7 | 7 | use FOS\RestBundle\Controller\Annotations\Get; |
| 8 | 8 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
| 9 | - |
|
| 10 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 11 | - |
|
| 12 | 10 | use Symfony\Component\HttpFoundation\Response; |
| 13 | - |
|
| 14 | 11 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
| 15 | 12 | use Oro\Bundle\SoapBundle\Request\Parameters\Filter\ChainParameterFilter; |
| 16 | 13 | use Oro\Bundle\SoapBundle\Request\Parameters\Filter\EntityClassParameterFilter; |
@@ -6,11 +6,8 @@ |
||
| 6 | 6 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
| 7 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
| 8 | 8 | use FOS\RestBundle\Controller\Annotations\Get; |
| 9 | - |
|
| 10 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 11 | - |
|
| 12 | 10 | use Symfony\Component\HttpFoundation\Response; |
| 13 | - |
|
| 14 | 11 | use Oro\Bundle\ActivityBundle\Entity\Manager\ActivityTargetApiEntityManager; |
| 15 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
| 16 | 13 | |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace Oro\Bundle\ActivityBundle\Entity\Manager; |
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\Persistence\ObjectManager; |
| 6 | - |
|
| 7 | 6 | use Oro\Bundle\ActivityBundle\Manager\ActivityManager; |
| 8 | 7 | use Oro\Bundle\SearchBundle\Engine\Indexer as SearchIndexer; |
| 9 | 8 | use Oro\Bundle\SoapBundle\Entity\Manager\ApiEntityManager; |
@@ -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 | |