@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use Composer\Package\PackageInterface; |
| 5 | 5 | use Oro\Bundle\DistributionBundle\Manager\Helper\ChangeSetBuilder; |
| 6 | -use Oro\Bundle\DistributionBundle\Test\PhpUnit\Helper\MockHelperTrait; |
|
| 7 | 6 | |
| 8 | 7 | class ChangeSetBuilderTest extends \PHPUnit_Framework_TestCase |
| 9 | 8 | { |
@@ -1317,7 +1317,7 @@ discard block |
||
| 1317 | 1317 | } |
| 1318 | 1318 | |
| 1319 | 1319 | /** |
| 1320 | - * @return \PHPUnit_Framework_MockObject_MockObject|BufferIO |
|
| 1320 | + * @return BufferIO |
|
| 1321 | 1321 | */ |
| 1322 | 1322 | protected function createComposerIO() |
| 1323 | 1323 | { |
@@ -1347,7 +1347,7 @@ discard block |
||
| 1347 | 1347 | * @param Runner $scriptRunner |
| 1348 | 1348 | * @param MaintenanceMode $maintenance |
| 1349 | 1349 | * @param LoggerInterface $logger |
| 1350 | - * @param null $pathToComposerJson |
|
| 1350 | + * @param string $pathToComposerJson |
|
| 1351 | 1351 | * |
| 1352 | 1352 | * @return PackageManager |
| 1353 | 1353 | */ |
@@ -1437,7 +1437,7 @@ discard block |
||
| 1437 | 1437 | } |
| 1438 | 1438 | |
| 1439 | 1439 | /** |
| 1440 | - * @param $name |
|
| 1440 | + * @param string $name |
|
| 1441 | 1441 | * @return PackageInterface|\PHPUnit_Framework_MockObject_MockObject |
| 1442 | 1442 | */ |
| 1443 | 1443 | protected function createPackageMock($name) |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | } |
| 1473 | 1473 | |
| 1474 | 1474 | /** |
| 1475 | - * @param $bufferOutput |
|
| 1475 | + * @param string $bufferOutput |
|
| 1476 | 1476 | * @return BufferIO|\PHPUnit_Framework_MockObject_MockObject |
| 1477 | 1477 | */ |
| 1478 | 1478 | protected function createBufferIoMock($bufferOutput) |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | 105 | * @param $object |
| 106 | - * @param $objectClass |
|
| 106 | + * @param string $objectClass |
|
| 107 | 107 | * |
| 108 | 108 | * @return mixed |
| 109 | 109 | */ |
@@ -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 | |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | 217 | * @param EmailEntity $emailEntity |
| 218 | - * @param $templatePath |
|
| 218 | + * @param string|null $templatePath |
|
| 219 | 219 | * |
| 220 | 220 | * @return null|string |
| 221 | 221 | */ |
@@ -232,8 +232,8 @@ discard block |
||
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | /** |
| 235 | - * @param $prefix |
|
| 236 | - * @param $subject |
|
| 235 | + * @param string $prefix |
|
| 236 | + * @param string $subject |
|
| 237 | 237 | * |
| 238 | 238 | * @return string |
| 239 | 239 | */ |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | /** |
| 249 | 249 | * @param string $entityClass |
| 250 | 250 | * @param string $entityId |
| 251 | - * @return object |
|
| 251 | + * @return \Oro\Bundle\EmailBundle\Model\EmailTemplateInterface |
|
| 252 | 252 | */ |
| 253 | 253 | public function getTargetEntity($entityClass, $entityId) |
| 254 | 254 | { |
@@ -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 | |
@@ -6,12 +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 | -use FOS\RestBundle\Controller\Annotations\Delete; |
|
| 10 | - |
|
| 11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 12 | - |
|
| 13 | 10 | use Symfony\Component\HttpFoundation\Response; |
| 14 | - |
|
| 15 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
| 16 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
| 17 | 13 | use Oro\Bundle\SoapBundle\Request\Parameters\Filter\StringToArrayParameterFilter; |
@@ -6,14 +6,9 @@ |
||
| 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 | -use FOS\RestBundle\Controller\Annotations\Delete; |
|
| 10 | - |
|
| 11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
| 12 | - |
|
| 13 | 10 | use Symfony\Component\HttpFoundation\Response; |
| 14 | - |
|
| 15 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
| 16 | -use Oro\Bundle\SecurityBundle\SecurityFacade; |
|
| 17 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestGetController; |
| 18 | 13 | |
| 19 | 14 | /** |
@@ -4,21 +4,14 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\ORM\EntityManager; |
| 6 | 6 | use Doctrine\ORM\EntityRepository; |
| 7 | -use Doctrine\ORM\Query; |
|
| 8 | - |
|
| 9 | 7 | use FOS\RestBundle\Util\Codes; |
| 10 | - |
|
| 11 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
| 12 | 9 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 13 | 10 | use Symfony\Component\HttpFoundation\Request; |
| 14 | 11 | use Symfony\Component\HttpFoundation\Response; |
| 15 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
| 16 | 12 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; |
| 17 | - |
|
| 18 | 13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 19 | 14 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 20 | - |
|
| 21 | -use Oro\Bundle\EmailBundle\Model\WebSocket\WebSocketSendProcessor; |
|
| 22 | 15 | use Oro\Bundle\EmailBundle\Cache\EmailCacheManager; |
| 23 | 16 | use Oro\Bundle\EmailBundle\Entity\Manager\EmailManager; |
| 24 | 17 | use Oro\Bundle\EmailBundle\Entity\Email; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | /** |
| 223 | - * @return MailboxProcessSettings|null |
|
| 223 | + * @return MailboxProcessSettings |
|
| 224 | 224 | */ |
| 225 | 225 | public function getProcessSettings() |
| 226 | 226 | { |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | /** |
| 336 | - * @return Collection|EmailUser[] |
|
| 336 | + * @return EmailUser[] |
|
| 337 | 337 | */ |
| 338 | 338 | public function getEmailUsers() |
| 339 | 339 | { |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | } |
| 426 | 426 | |
| 427 | 427 | /** |
| 428 | - * @param AutoResponseRule[]|Collection $autoResponseRules |
|
| 428 | + * @param Collection $autoResponseRules |
|
| 429 | 429 | */ |
| 430 | 430 | public function setAutoResponseRules(Collection $autoResponseRules) |
| 431 | 431 | { |
@@ -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 | |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | /** |
| 44 | 44 | * Returns id of an email entity corresponding given criteria |
| 45 | 45 | * |
| 46 | - * @param Criteria|array $criteria |
|
| 46 | + * @param Criteria $criteria |
|
| 47 | 47 | * @param array $joins |
| 48 | 48 | * |
| 49 | 49 | * @return int|null |
@@ -3,11 +3,8 @@ |
||
| 3 | 3 | namespace Oro\Bundle\EmailBundle\Sync; |
| 4 | 4 | |
| 5 | 5 | use Doctrine\ORM\EntityManager; |
| 6 | -use Doctrine\ORM\Query; |
|
| 7 | - |
|
| 8 | 6 | use Psr\Log\LoggerAwareInterface; |
| 9 | 7 | use Psr\Log\LoggerAwareTrait; |
| 10 | - |
|
| 11 | 8 | use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage; |
| 12 | 9 | use Oro\Bundle\EmailBundle\Entity\Manager\EmailAddressManager; |
| 13 | 10 | use Oro\Bundle\EmailBundle\Tools\EmailAddressHelper; |