@@ -3,12 +3,10 @@ |
||
3 | 3 | namespace OroCRM\Bundle\ChannelBundle\Provider; |
4 | 4 | |
5 | 5 | use Symfony\Component\Routing\RouterInterface; |
6 | - |
|
7 | 6 | use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; |
8 | 7 | use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; |
9 | 8 | use Oro\Bundle\EntityBundle\Provider\EntityProvider; |
10 | 9 | use Oro\Bundle\EntityConfigBundle\Config\ConfigManager; |
11 | -use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel; |
|
12 | 10 | |
13 | 11 | class MetadataProvider implements MetadataProviderInterface |
14 | 12 | { |
@@ -41,7 +41,7 @@ |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | - * @return Channel|bool |
|
44 | + * @return null|Channel |
|
45 | 45 | */ |
46 | 46 | protected function getChannelReference() |
47 | 47 | { |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace OroCRM\Bundle\ChannelBundle\Provider; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Symfony\Bridge\Doctrine\RegistryInterface; |
8 | 7 | use Symfony\Component\HttpFoundation\Request; |
9 | - |
|
10 | 8 | use OroCRM\Bundle\ChannelBundle\Entity\Channel; |
11 | 9 | use OroCRM\Bundle\ChannelBundle\Model\ChannelAwareInterface; |
12 | 10 |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\Common\Cache\Cache; |
7 | - |
|
8 | 7 | use Symfony\Bridge\Doctrine\RegistryInterface; |
9 | - |
|
10 | 8 | use Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink; |
11 | 9 | use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper; |
12 | 10 | use OroCRM\Bundle\ChannelBundle\Entity\Channel; |
@@ -3,9 +3,7 @@ |
||
3 | 3 | namespace OroCRM\Bundle\ChannelBundle\Tests\Functional\Command; |
4 | 4 | |
5 | 5 | use Symfony\Component\Yaml\Yaml; |
6 | - |
|
7 | 6 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
8 | - |
|
9 | 7 | use OroCRM\Bundle\ChannelBundle\Entity\Repository\LifetimeValueAverageAggregationRepository; |
10 | 8 | |
11 | 9 | /** |
@@ -3,10 +3,7 @@ |
||
3 | 3 | namespace OroCRM\Bundle\ChannelBundle\Tests\Functional\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Component\Form\Form; |
6 | - |
|
7 | 6 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
8 | -use Oro\Bundle\OrganizationBundle\Entity\Organization; |
|
9 | -use Oro\Bundle\OrganizationBundle\Migrations\Data\ORM\LoadOrganizationAndBusinessUnitData; |
|
10 | 7 | |
11 | 8 | /** |
12 | 9 | * @outputBuffering enabled |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\DataFixtures\AbstractFixture; |
6 | 6 | use Doctrine\Common\Persistence\ObjectManager; |
7 | - |
|
8 | 7 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
9 | - |
|
10 | 8 | use OroCRM\Bundle\ChannelBundle\Entity\Channel; |
11 | 9 | |
12 | 10 | class LoadChannel extends AbstractFixture |
@@ -4,9 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\DataFixtures\AbstractFixture; |
6 | 6 | use Doctrine\Common\Persistence\ObjectManager; |
7 | - |
|
8 | 7 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
9 | - |
|
10 | 8 | use OroCRM\Bundle\ChannelBundle\Entity\Channel; |
11 | 9 | |
12 | 10 | class LoadChannels extends AbstractFixture |
@@ -71,7 +71,7 @@ |
||
71 | 71 | * @param string $name |
72 | 72 | * @param \DateTime $created |
73 | 73 | * |
74 | - * @return mixed |
|
74 | + * @return null|\OroCRM\Bundle\ChannelBundle\Entity\Channel |
|
75 | 75 | */ |
76 | 76 | protected function ensureChannelCreated(EntityManager $em, $name, \DateTime $created) |
77 | 77 | { |
@@ -5,12 +5,9 @@ |
||
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\Common\Persistence\ObjectManager; |
7 | 7 | use Doctrine\Common\DataFixtures\AbstractFixture; |
8 | - |
|
9 | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
10 | 9 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; |
11 | - |
|
12 | 10 | use Oro\Bundle\UserBundle\Entity\User; |
13 | - |
|
14 | 11 | use OroCRM\Bundle\AccountBundle\Entity\Account; |
15 | 12 | use OroCRM\Bundle\ChannelBundle\Builder\BuilderFactory; |
16 | 13 | use OroCRM\Bundle\ChannelBundle\Entity\LifetimeValueHistory; |
@@ -2,14 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace OroCRM\Bundle\ChannelBundle\Tests\Unit\EventListener; |
4 | 4 | |
5 | -use Doctrine\ORM\Event\OnClearEventArgs; |
|
6 | 5 | use Doctrine\ORM\UnitOfWork; |
7 | 6 | use Doctrine\ORM\EntityManager; |
8 | 7 | use Doctrine\ORM\Event\OnFlushEventArgs; |
9 | 8 | use Doctrine\ORM\Event\PostFlushEventArgs; |
10 | - |
|
11 | 9 | use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\OrmTestCase; |
12 | - |
|
13 | 10 | use OroCRM\Bundle\ChannelBundle\Tests\Unit\Stubs\Entity\Customer; |
14 | 11 | use OroCRM\Bundle\ChannelBundle\EventListener\ChannelDoctrineListener; |
15 | 12 | use OroCRM\Bundle\ChannelBundle\Entity\Repository\LifetimeHistoryRepository; |