@@ -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 | { |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | * @param integer $entityId |
| 132 | 132 | * @param array $filter |
| 133 | 133 | * |
| 134 | - * @return ActivityList[] |
|
| 134 | + * @return string|boolean |
|
| 135 | 135 | */ |
| 136 | 136 | public function getListCount($entityClass, $entityId, $filter) |
| 137 | 137 | { |
@@ -279,9 +279,11 @@ discard block |
||
| 279 | 279 | /** |
| 280 | 280 | * Get Grouped Entities by Activity Entity |
| 281 | 281 | * |
| 282 | - * @param object $entity |
|
| 282 | + * @param \stdClass $entity |
|
| 283 | 283 | * @param string $widgetId |
| 284 | 284 | * @param array $filterMetadata |
| 285 | + * @param string $targetActivityClass |
|
| 286 | + * @param string $targetActivityId |
|
| 285 | 287 | * |
| 286 | 288 | * @return array |
| 287 | 289 | */ |
@@ -333,7 +335,7 @@ discard block |
||
| 333 | 335 | |
| 334 | 336 | /** |
| 335 | 337 | * @param ActivityList $entity |
| 336 | - * @param object $entityProvider |
|
| 338 | + * @param \Oro\Bundle\ActivityListBundle\Model\ActivityListProviderInterface $entityProvider |
|
| 337 | 339 | * |
| 338 | 340 | * @return bool |
| 339 | 341 | */ |
@@ -349,7 +351,7 @@ discard block |
||
| 349 | 351 | |
| 350 | 352 | /** |
| 351 | 353 | * @param ActivityList $entity |
| 352 | - * @param object $entityProvider |
|
| 354 | + * @param \Oro\Bundle\ActivityListBundle\Model\ActivityListProviderInterface $entityProvider |
|
| 353 | 355 | * |
| 354 | 356 | * @return array |
| 355 | 357 | */ |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\EventManager; |
| 6 | 6 | use Doctrine\DBAL\Driver\Connection; |
| 7 | - |
|
| 8 | 7 | use Symfony\Component\Filesystem\Filesystem; |
| 9 | - |
|
| 10 | 8 | use Oro\Component\TestUtils\ORM\Mocks\DriverMock; |
| 11 | 9 | use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock; |
| 12 | 10 | |
@@ -369,7 +369,6 @@ |
||
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | /** |
| 372 | - * @param string $columnName |
|
| 373 | 372 | * |
| 374 | 373 | * @return string |
| 375 | 374 | */ |
@@ -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; |
@@ -369,7 +369,7 @@ |
||
| 369 | 369 | |
| 370 | 370 | /** |
| 371 | 371 | * @param int|null $id |
| 372 | - * @return AbstractAddress|\PHPUnit_Framework_MockObject_MockObject |
|
| 372 | + * @return AbstractAddress |
|
| 373 | 373 | */ |
| 374 | 374 | protected function createAddress($id = null) |
| 375 | 375 | { |
@@ -2,8 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Oro\Bundle\AddressBundle\Tests\Entity; |
| 4 | 4 | |
| 5 | -use Symfony\Component\Validator\ExecutionContext; |
|
| 6 | - |
|
| 7 | 5 | use Oro\Bundle\AddressBundle\Entity\AbstractAddress; |
| 8 | 6 | use Oro\Bundle\AddressBundle\Entity\Country; |
| 9 | 7 | use Oro\Bundle\AddressBundle\Entity\Region; |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | /** |
| 96 | 96 | * @param string|null $email |
| 97 | 97 | * @param int $id |
| 98 | - * @return AbstractEmail|\PHPUnit_Framework_MockObject_MockObject |
|
| 98 | + * @return AbstractEmail |
|
| 99 | 99 | */ |
| 100 | 100 | protected function createEmail($email = null, $id = null) |
| 101 | 101 | { |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | /** |
| 97 | 97 | * @param string|null $phone |
| 98 | 98 | * @param int $id |
| 99 | - * @return AbstractPhone|\PHPUnit_Framework_MockObject_MockObject |
|
| 99 | + * @return AbstractPhone |
|
| 100 | 100 | */ |
| 101 | 101 | protected function createPhone($phone = null, $id = null) |
| 102 | 102 | { |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | * @param array $filters |
| 137 | 137 | * @param array $attributes |
| 138 | 138 | * @param int $lineno |
| 139 | - * @return AsseticNode |
|
| 139 | + * @return DebugAsseticNode |
|
| 140 | 140 | */ |
| 141 | 141 | protected function createDebugAsseticNode( |
| 142 | 142 | \Twig_NodeInterface $body, |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\EventManager; |
| 6 | 6 | use Doctrine\DBAL\Driver\Connection; |
| 7 | - |
|
| 8 | 7 | use Symfony\Component\Filesystem\Filesystem; |
| 9 | - |
|
| 10 | 8 | use Oro\Component\TestUtils\ORM\Mocks\DriverMock; |
| 11 | 9 | use Oro\Component\TestUtils\ORM\Mocks\EntityManagerMock; |
| 12 | 10 | |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | protected $paramsToBind = []; |
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | - * @param array $paramsToBind |
|
| 19 | + * @param string[] $paramsToBind |
|
| 20 | 20 | */ |
| 21 | 21 | public function __construct($paramsToBind = []) |
| 22 | 22 | { |