@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityBundle\Provider; |
4 | 4 | |
5 | 5 | use Symfony\Component\Translation\TranslatorInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; |
8 | 7 | use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; |
9 | 8 | use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityBundle\Routing; |
4 | 4 | |
5 | 5 | use Symfony\Component\Routing\Route; |
6 | - |
|
7 | 6 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
8 | 7 | use Nelmio\ApiDocBundle\Extractor\HandlerInterface; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityBundle\Provider\EntityClassNameProviderInterface; |
11 | 9 | use Oro\Bundle\EntityBundle\ORM\EntityAliasResolver; |
12 | 10 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityBundle\Tests\Unit\Provider; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\Mapping\MappingException; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityBundle\EntityConfig\GroupingScope; |
8 | 7 | use Oro\Bundle\EntityBundle\Provider\DictionaryVirtualFieldProvider; |
9 | 8 | use Oro\Bundle\EntityConfigBundle\Config\Config; |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Bridge\Doctrine\ManagerRegistry; |
6 | 6 | use Symfony\Component\Translation\Translator; |
7 | - |
|
8 | 7 | use Oro\Bundle\EntityBundle\ORM\EntityClassResolver; |
9 | 8 | use Oro\Bundle\EntityBundle\Provider\EntityFieldProvider; |
10 | 9 | use Oro\Bundle\EntityBundle\Provider\EntityProvider; |
@@ -96,7 +96,7 @@ |
||
96 | 96 | * @param \PHPUnit_Framework_MockObject_MockObject|null $emMock |
97 | 97 | * @param boolean $isReturnManager |
98 | 98 | * |
99 | - * @return \PHPUnit_Framework_MockObject_MockObject |
|
99 | + * @return \Doctrine\Common\Persistence\ManagerRegistry |
|
100 | 100 | */ |
101 | 101 | protected function getDoctrineMock($emMock = null, $isReturnManager = true) |
102 | 102 | { |
@@ -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\EntityBundle\Provider\EntityHierarchyProvider; |
9 | 8 | use Oro\Bundle\EntityConfigBundle\Config\Config; |
10 | 9 | use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
7 | 7 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
8 | 8 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
9 | - |
|
10 | 9 | use Oro\Bundle\EntityBundle\Exception\NotManageableEntityException; |
11 | 10 | use Oro\Bundle\EntityBundle\ORM\DoctrineHelper; |
12 | 11 |
@@ -4,13 +4,11 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\DBAL\Connection; |
6 | 6 | use Doctrine\ORM\EntityManager; |
7 | - |
|
8 | 7 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; |
9 | 8 | use Symfony\Component\Console\Input\InputArgument; |
10 | 9 | use Symfony\Component\Console\Input\InputInterface; |
11 | 10 | use Symfony\Component\Console\Input\InputOption; |
12 | 11 | use Symfony\Component\Console\Output\OutputInterface; |
13 | - |
|
14 | 12 | use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; |
15 | 13 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
16 | 14 | use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\EntityConfigBundle\Config; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Cache\CacheProvider; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityConfigBundle\Config\Id\EntityConfigId; |
8 | 7 | use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; |
9 | 8 |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | |
263 | 263 | /** |
264 | 264 | * @param DatagridConfiguration $config |
265 | - * @param $itemType |
|
265 | + * @param string|null $itemType |
|
266 | 266 | */ |
267 | 267 | protected function addEntityConfigProperties(DatagridConfiguration $config, $itemType) |
268 | 268 | { |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | * @param array $filters |
322 | 322 | * @param array $actions |
323 | 323 | * |
324 | - * @return callable |
|
324 | + * @return \Closure |
|
325 | 325 | */ |
326 | 326 | public function getActionConfigurationClosure($filters, $actions) |
327 | 327 | { |
@@ -3,9 +3,7 @@ discard block |
||
3 | 3 | namespace Oro\Bundle\EntityConfigBundle\EventListener; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\QueryBuilder; |
6 | - |
|
7 | 6 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
8 | - |
|
9 | 7 | use Oro\Bundle\DataGridBundle\Extension\Action\ActionExtension; |
10 | 8 | use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration; |
11 | 9 | use Oro\Bundle\DataGridBundle\Event\BuildAfter; |
@@ -13,10 +11,8 @@ discard block |
||
13 | 11 | use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration; |
14 | 12 | use Oro\Bundle\DataGridBundle\Datasource\ResultRecord; |
15 | 13 | use Oro\Bundle\DataGridBundle\Provider\SystemAwareResolver; |
16 | - |
|
17 | 14 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
18 | 15 | use Oro\Bundle\EntityConfigBundle\Exception\LogicException; |
19 | - |
|
20 | 16 | use Oro\Bundle\FilterBundle\Filter\FilterUtility; |
21 | 17 | |
22 | 18 | /** |