Skip to content

Commit c4e3207

Browse files
rgrebenchukrgrebenchuk
committed
Merge remote-tracking branch 'remotes/dev/1.10' into 1.10
2 parents 3705531 + 876a619 commit c4e3207

File tree

40 files changed

+1173
-240
lines changed

40 files changed

+1173
-240
lines changed

src/Oro/CRMCallBridgeBundle/DependencyInjection/Configuration.php renamed to src/Oro/Bridge/CrmCall/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\DependencyInjection;
3+
namespace Oro\Bridge\CrmCall\DependencyInjection;
44

55
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
66
use Symfony\Component\Config\Definition\ConfigurationInterface;

src/Oro/CRMCallBridgeBundle/DependencyInjection/OroCRMCallBridgeExtension.php renamed to src/Oro/Bridge/CrmCall/DependencyInjection/OroCRMCallBridgeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\DependencyInjection;
3+
namespace Oro\Bridge\CrmCall\DependencyInjection;
44

55
use Symfony\Component\DependencyInjection\ContainerBuilder;
66
use Symfony\Component\Config\FileLocator;
@@ -20,7 +20,7 @@ class OroCRMCallBridgeExtension extends Extension
2020
public function load(array $configs, ContainerBuilder $container)
2121
{
2222
$configuration = new Configuration();
23-
$config = $this->processConfiguration($configuration, $configs);
23+
$this->processConfiguration($configuration, $configs);
2424

2525
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
2626
$loader->load('services.yml');

src/Oro/CRMCallBridgeBundle/Migrations/Data/ORM/CrmRoles/roles.yml renamed to src/Oro/Bridge/CrmCall/Migrations/Data/ORM/CrmRoles/roles.yml

File renamed without changes.

src/Oro/CRMCallBridgeBundle/Migrations/Data/ORM/UpdateCallAccessLevels.php renamed to src/Oro/Bridge/CrmCall/Migrations/Data/ORM/UpdateCallAccessLevels.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\Migrations\Data\ORM;
3+
namespace Oro\Bridge\CrmCall\Migrations\Data\ORM;
44

55
use Doctrine\Common\DataFixtures\AbstractFixture;
66
use Doctrine\Common\Persistence\ObjectManager;

src/Oro/CRMCallBridgeBundle/Migrations/Schema/OroCRMCallBridgeBundleInstaller.php renamed to src/Oro/Bridge/CrmCall/Migrations/Schema/OroCRMCallBridgeBundleInstaller.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\Migrations\Schema;
3+
namespace Oro\Bridge\CrmCall\Migrations\Schema;
44

55
use Doctrine\DBAL\Schema\Schema;
66

@@ -13,7 +13,7 @@
1313
use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtension;
1414
use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtensionAwareInterface;
1515

16-
use Oro\CRMCallBridgeBundle\Migrations\Schema\v1_0\OroCRMCallBridgeBundle;
16+
use Oro\Bridge\CrmCall\Migrations\Schema\v1_0\OroCRMCallBridgeBundle;
1717

1818
class OroCRMCallBridgeBundleInstaller implements
1919
Installation,

src/Oro/CRMCallBridgeBundle/Migrations/Schema/v1_0/OroCRMCallBridgeBundle.php renamed to src/Oro/Bridge/CrmCall/Migrations/Schema/v1_0/OroCRMCallBridgeBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\Migrations\Schema\v1_0;
3+
namespace Oro\Bridge\CrmCall\Migrations\Schema\v1_0;
44

55
use Doctrine\DBAL\Schema\Schema;
66

src/Oro/CRMCallBridgeBundle/OroCRMCallBridgeBundle.php renamed to src/Oro/Bridge/CrmCall/OroCRMCallBridgeBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle;
3+
namespace Oro\Bridge\CrmCall;
44

55
use Symfony\Component\HttpKernel\Bundle\Bundle;
66

src/Oro/CRMCallBridgeBundle/Provider/CallDirectionProvider.php renamed to src/Oro/Bridge/CrmCall/Provider/CallDirectionProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Oro\CRMCallBridgeBundle\Provider;
3+
namespace Oro\Bridge\CrmCall\Provider;
44

55
use Doctrine\Common\Util\ClassUtils;
66
use Doctrine\ORM\EntityManager;

src/Oro/CRMCallBridgeBundle/Resources/config/oro/bundles.yml renamed to src/Oro/Bridge/CrmCall/Resources/config/oro/bundles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
bundles:
22
#Should be loaded after OroCRMCaseBundle, OroCRMCallBundle, OroCRMMagentoBundle, OroCRMContactUsBundle,
33
#because of migration priority
4-
- { name: Oro\CRMCallBridgeBundle\OroCRMCallBridgeBundle, priority: 110 }
4+
- { name: Oro\Bridge\CrmCall\OroCRMCallBridgeBundle, priority: 110 }

src/Oro/CRMCallBridgeBundle/Resources/config/services.yml renamed to src/Oro/Bridge/CrmCall/Resources/config/services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
oro_crm_call_bridge.call_activity_direction.provider:
3-
class: Oro\CRMCallBridgeBundle\Provider\CallDirectionProvider
3+
class: Oro\Bridge\CrmCall\Provider\CallDirectionProvider
44
arguments:
55
- '@oro_activity.manager'
66
tags:

0 commit comments

Comments
 (0)