@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Util\ClassUtils; |
6 | 6 | use Doctrine\Common\Persistence\ObjectManager; |
7 | - |
|
8 | 7 | use Oro\Bundle\NotificationBundle\Entity\EmailNotification; |
9 | 8 | use Oro\Bundle\NotificationBundle\Event\NotificationEvent; |
10 | 9 | use Oro\Bundle\NotificationBundle\Event\Handler\EventHandlerInterface; |
@@ -31,6 +31,9 @@ |
||
31 | 31 | */ |
32 | 32 | protected $notificationRules; |
33 | 33 | |
34 | + /** |
|
35 | + * @param string $className |
|
36 | + */ |
|
34 | 37 | public function __construct(ObjectManager $em, $className) |
35 | 38 | { |
36 | 39 | $this->handlers = array(); |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\DomCrawler\Form; |
6 | 6 | use Symfony\Component\DomCrawler\Field\ChoiceFormField; |
7 | - |
|
8 | 7 | use Oro\Bundle\TestFrameworkBundle\Test\WebTestCase; |
9 | 8 | |
10 | 9 | /** |
@@ -3,10 +3,8 @@ |
||
3 | 3 | namespace Oro\Bundle\TagBundle\Tests\Unit\Form\Handler; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Persistence\ObjectManager; |
6 | - |
|
7 | 6 | use Symfony\Component\Form\FormInterface; |
8 | 7 | use Symfony\Component\HttpFoundation\Request; |
9 | - |
|
10 | 8 | use Oro\Bundle\NotificationBundle\Entity\EmailNotification; |
11 | 9 | use Oro\Bundle\NotificationBundle\Form\Handler\EmailNotificationHandler; |
12 | 10 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\NotificationBundle\Tests\Unit\Provider; |
4 | 4 | |
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | - |
|
7 | 6 | use Oro\Bundle\NotificationBundle\Event\Handler\EmailNotificationHandler; |
8 | 7 | use Oro\Bundle\NotificationBundle\Event\Handler\EventHandlerInterface; |
9 | 8 | use Oro\Bundle\NotificationBundle\Provider\NotificationManager; |
@@ -3,13 +3,11 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Response; |
6 | - |
|
7 | 6 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
8 | 7 | use FOS\RestBundle\Routing\ClassResourceInterface; |
9 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
10 | 9 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
11 | 10 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
12 | - |
|
13 | 11 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
14 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
15 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -2,7 +2,6 @@ |
||
2 | 2 | namespace Oro\Bundle\OrganizationBundle\Controller\Api\Soap; |
3 | 3 | |
4 | 4 | use BeSimple\SoapBundle\ServiceDefinition\Annotation as Soap; |
5 | - |
|
6 | 5 | use Oro\Bundle\SoapBundle\Controller\Api\Soap\SoapController; |
7 | 6 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
8 | 7 |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use Symfony\Component\Config\FileLocator; |
7 | 7 | use Symfony\Component\HttpKernel\DependencyInjection\Extension; |
8 | 8 | use Symfony\Component\DependencyInjection\Loader; |
9 | -use Symfony\Component\Yaml\Yaml; |
|
10 | 9 | |
11 | 10 | class OroOrganizationExtension extends Extension |
12 | 11 | { |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | 6 | use Doctrine\ORM\EntityRepository; |
7 | - |
|
8 | 7 | use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit; |
9 | 8 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
10 | 9 | use Oro\Bundle\OrganizationBundle\Entity\Repository\BusinessUnitRepository; |
@@ -63,7 +63,7 @@ |
||
63 | 63 | * @param User $user |
64 | 64 | * @param string $name |
65 | 65 | * |
66 | - * @return null|Organization |
|
66 | + * @return Organization[] |
|
67 | 67 | */ |
68 | 68 | public function getEnabledUserOrganizationByName(User $user, $name) |
69 | 69 | { |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace Oro\Bundle\OrganizationBundle\Entity\Manager; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityManager; |
6 | - |
|
7 | 6 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
8 | 7 | use Oro\Bundle\OrganizationBundle\Entity\Repository\OrganizationRepository; |
9 | 8 | use Oro\Bundle\UserBundle\Entity\User; |