From de249fb784c10486cb39a917658157fc599e1f4a Mon Sep 17 00:00:00 2001 From: Hryhorii Hrebiniuk Date: Wed, 8 Oct 2014 14:39:27 +0300 Subject: [PATCH 01/27] few translation fixes (cherry picked from commit 8c6f2eb) --- .../widget-container/templates/widget-add-template.html | 2 +- .../public/js/widget-container/widget-add-view.js | 9 +++++++-- src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php | 5 +++++ src/Oro/Bundle/UIBundle/Resources/public/js/modal.js | 9 +++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html index 3e6a736e97e..565a0bd73b6 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html +++ b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html @@ -1,4 +1,4 @@ -
+
    <% _.each(availableWidgets, function (widget, name) { %> diff --git a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js index ae153030dc8..3c419fb5748 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js +++ b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js @@ -13,6 +13,8 @@ define(function (require) { var Modal = require('oroui/js/modal'); var constants = require('../constants'); + // WebSys + var __ = require('orotranslation/js/translator'); /** * @export orosidebar/js/widget-container/widget-add-view * @class orosidebar.widgetContainer.WidgetAddView @@ -29,9 +31,12 @@ define(function (require) { initialize: function (options) { this.options = _.defaults(options || {}, this.options); options.content = _.template(widgetAddTemplate, { - 'availableWidgets': options.sidebar.getAvailableWidgets() + 'availableWidgets': options.sidebar.getAvailableWidgets(), + // WebSys + 'addWidgetText': __('Add widget') }); - options.title = 'Select widget to add'; + // WebSys + options.title = __('Select widget to add'); Modal.prototype.initialize.apply(this, arguments); }, diff --git a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php index 2114edfa633..e5af27058cf 100644 --- a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php +++ b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php @@ -53,8 +53,13 @@ public function getWidgetDefinitions($placement) $definitions = $this->widgetDefinitionsRegistry ->getWidgetDefinitionsByPlacement($placement) ->toArray(); + + // WebSys + $translator = $this->container->get('translator'); foreach ($definitions as &$definition) { $definition['icon'] = $assetHelper->getUrl($definition['icon']); + // WebSys + $definition['title'] = $translator->trans($definition['title']); } return $definitions; } diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js b/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js index b9a5de55166..b3ec71dc036 100644 --- a/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js +++ b/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js @@ -21,6 +21,15 @@ define([ /** @property {String} */ className: 'modal', + // WebSys + initialize: function(options){ + options = _.extend({ + okText: __('OK'), + cancelText: __('Cancel') + }, options); + Backbone.BootstrapModal.prototype.initialize.call(this, options); + }, + /** * Renders and shows the modal * From 36fac43bebd3e384434d8f4f92529d427f0070d2 Mon Sep 17 00:00:00 2001 From: Hryhorii Hrebiniuk Date: Wed, 8 Oct 2014 15:14:00 +0300 Subject: [PATCH 02/27] OC-442: Few translation fixes (cherry picked from commit dfbd3c8) --- .../SidebarBundle/Resources/public/js/view.js | 2 +- .../templates/widget-add-template.html | 2 +- .../js/widget-container/widget-add-view.js | 9 +++----- .../Resources/translations/jsmessages.en.yml | 11 +++++++++- .../SidebarBundle/Twig/SidebarExtension.php | 3 --- .../UIBundle/Resources/public/js/modal.js | 21 +++++++++++-------- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/Oro/Bundle/SidebarBundle/Resources/public/js/view.js b/src/Oro/Bundle/SidebarBundle/Resources/public/js/view.js index 0f9d39b6397..ea85a02ed97 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/public/js/view.js +++ b/src/Oro/Bundle/SidebarBundle/Resources/public/js/view.js @@ -349,7 +349,7 @@ define(function (require) { } var modal = new DeleteConfirmation({ - content: __('The widget will be removed') + content: __('oro.sidebar.widget.remove.confirm.message') }); modal.on('ok', function () { diff --git a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html index 565a0bd73b6..2147c00b93f 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html +++ b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/templates/widget-add-template.html @@ -1,4 +1,4 @@ -
    +
      <% _.each(availableWidgets, function (widget, name) { %> diff --git a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js index 3c419fb5748..bd2ccaa10d8 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js +++ b/src/Oro/Bundle/SidebarBundle/Resources/public/js/widget-container/widget-add-view.js @@ -13,8 +13,8 @@ define(function (require) { var Modal = require('oroui/js/modal'); var constants = require('../constants'); - // WebSys var __ = require('orotranslation/js/translator'); + /** * @export orosidebar/js/widget-container/widget-add-view * @class orosidebar.widgetContainer.WidgetAddView @@ -31,12 +31,9 @@ define(function (require) { initialize: function (options) { this.options = _.defaults(options || {}, this.options); options.content = _.template(widgetAddTemplate, { - 'availableWidgets': options.sidebar.getAvailableWidgets(), - // WebSys - 'addWidgetText': __('Add widget') + 'availableWidgets': options.sidebar.getAvailableWidgets() }); - // WebSys - options.title = __('Select widget to add'); + options.title = __('oro.sidebar.widget.add.dialog.title'); Modal.prototype.initialize.apply(this, arguments); }, diff --git a/src/Oro/Bundle/SidebarBundle/Resources/translations/jsmessages.en.yml b/src/Oro/Bundle/SidebarBundle/Resources/translations/jsmessages.en.yml index bccd24e1b90..fc44f89e650 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/translations/jsmessages.en.yml +++ b/src/Oro/Bundle/SidebarBundle/Resources/translations/jsmessages.en.yml @@ -1 +1,10 @@ -"The widget will be removed": "The widget will be removed" \ No newline at end of file +oro.sidebar: + widget: + add: + dialog: + title: "Select widget to add" + content: + section_title: "Add widget" + remove: + confirm: + message: "The widget will be removed" diff --git a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php index e5af27058cf..986ca5fc593 100644 --- a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php +++ b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php @@ -53,12 +53,9 @@ public function getWidgetDefinitions($placement) $definitions = $this->widgetDefinitionsRegistry ->getWidgetDefinitionsByPlacement($placement) ->toArray(); - - // WebSys $translator = $this->container->get('translator'); foreach ($definitions as &$definition) { $definition['icon'] = $assetHelper->getUrl($definition['icon']); - // WebSys $definition['title'] = $translator->trans($definition['title']); } return $definitions; diff --git a/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js b/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js index b3ec71dc036..b15f3da524d 100644 --- a/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js +++ b/src/Oro/Bundle/UIBundle/Resources/public/js/modal.js @@ -2,8 +2,9 @@ define([ 'underscore', 'backbone', + 'orotranslation/js/translator', 'backbone-bootstrap-modal' -], function (_, Backbone) { +], function (_, Backbone, __) { 'use strict'; var Modal, $; @@ -18,17 +19,19 @@ define([ * @extends Backbone.BootstrapModal */ Modal = Backbone.BootstrapModal.extend({ + defaults: { + okText: __('OK'), + cancelText: __('Cancel') + }, + /** @property {String} */ className: 'modal', - // WebSys - initialize: function(options){ - options = _.extend({ - okText: __('OK'), - cancelText: __('Cancel') - }, options); - Backbone.BootstrapModal.prototype.initialize.call(this, options); - }, + initialize: function (options) { + options = options || {}; + _.defaults(options, this.defaults); + Modal.__super__.initialize.call(this, options); + }, /** * Renders and shows the modal From 2a0b611e9e04eec48b9cb9ca1b247d57df41aae1 Mon Sep 17 00:00:00 2001 From: Ivan Shakuta Date: Tue, 18 Nov 2014 15:38:43 +0200 Subject: [PATCH 03/27] BAP-5380: Implement form type guessers for custom fields of existing entities - fix unit tests --- .../Form/Guesser/AbstractFormGuesser.php | 9 ++-- .../Form/Guesser/FormConfigGuesser.php | 43 +++++++++++++------ .../Form/Guesser/FormConfigGuesserTest.php | 2 +- 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php b/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php index 7b1081b3fcd..26654876262 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php +++ b/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php @@ -73,12 +73,15 @@ protected function getMetadataForClass($class) /** * @param string $formType - * @param array $formOptions + * @param array $formOptions + * @param int $confidence * @return TypeGuess */ - protected function createTypeGuess($formType, array $formOptions = array()) + protected function createTypeGuess($formType, array $formOptions = array(), $confidence = null) { - return new TypeGuess($formType, $formOptions, TypeGuess::HIGH_CONFIDENCE); + $confidence = is_null($confidence) ? TypeGuess::HIGH_CONFIDENCE : $confidence; + + return new TypeGuess($formType, $formOptions, $confidence); } /** diff --git a/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php b/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php index 4fcd2c48ed8..b9c7d462e93 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php +++ b/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php @@ -4,6 +4,9 @@ use Doctrine\Common\Persistence\ManagerRegistry; +use Symfony\Component\Form\Guess\TypeGuess; + +use Oro\Bundle\EntityConfigBundle\Config\ConfigInterface; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProviderInterface; class FormConfigGuesser extends AbstractFormGuesser @@ -33,28 +36,44 @@ public function __construct( public function guessType($class, $property) { $metadata = $this->getMetadataForClass($class); - if (!$metadata) { - return $this->createDefaultTypeGuess(); - } - - if (!$this->formConfigProvider->hasConfig($class, $property)) { + if (!$metadata || !$this->formConfigProvider->hasConfig($class, $property)) { return $this->createDefaultTypeGuess(); } $formConfig = $this->formConfigProvider->getConfig($class, $property); - if (!$formConfig->has('form_type')) { - // try to find form config for target class - if ($property && $metadata->hasAssociation($property) && $metadata->isSingleValuedAssociation($property)) { - return $this->guessType($metadata->getAssociationTargetClass($property), null); - } - return $this->createDefaultTypeGuess(); + $isSingleValuedAssoc = $property && $metadata->hasAssociation($property) && + $metadata->isSingleValuedAssociation($property); + $hasNoFormType = !$formConfig->has('form_type'); + + if ($hasNoFormType && $isSingleValuedAssoc) { + // try to find form config for target class + $guess = $this->guessType($metadata->getAssociationTargetClass($property), null); + } elseif ($hasNoFormType) { + $guess = $this->createDefaultTypeGuess(); + } else { + $guess = $this->getTypeGuess($formConfig, $class, $property); } + return $guess; + } + + /** + * @param ConfigInterface $formConfig + * @param string $class + * @param string $property + * + * @return TypeGuess + */ + protected function getTypeGuess(ConfigInterface $formConfig, $class, $property) + { $formType = $formConfig->get('form_type'); $formOptions = $formConfig->has('form_options') ? $formConfig->get('form_options') : array(); $formOptions = $this->addLabelOption($formOptions, $class, $property); - return $this->createTypeGuess($formType, $formOptions); + // fallback guess from recursive call must be with low confidence + $confidence = is_null($property) ? TypeGuess::LOW_CONFIDENCE : null; + + return $this->createTypeGuess($formType, $formOptions, $confidence); } } diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/Form/Guesser/FormConfigGuesserTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/Form/Guesser/FormConfigGuesserTest.php index 487459412f0..bdf73d5ed61 100644 --- a/src/Oro/Bundle/EntityBundle/Tests/Unit/Form/Guesser/FormConfigGuesserTest.php +++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/Form/Guesser/FormConfigGuesserTest.php @@ -256,7 +256,7 @@ public function testGuessByAssociationClass() ->will($this->returnValue($associationEntityConfig)); $guess = $this->guesser->guessType($class, $property); - $this->assertTypeGuess($guess, $associationFormType, $associationFormOptions, TypeGuess::HIGH_CONFIDENCE); + $this->assertTypeGuess($guess, $associationFormType, $associationFormOptions, TypeGuess::LOW_CONFIDENCE); } /** From bd0e2815a3cb2dfeadf602cc639fafbaf3cb383c Mon Sep 17 00:00:00 2001 From: Ivan Shakuta Date: Wed, 19 Nov 2014 19:51:52 +0200 Subject: [PATCH 04/27] BAP-5906: Validation for extended entities - fix validation loader in case when field is new --- .../Validator/ExtendFieldValidationLoader.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php b/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php index 086c0cfd9cd..e1dc4fc7a47 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php +++ b/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php @@ -2,6 +2,7 @@ namespace Oro\Bundle\EntityExtendBundle\Validator; +use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Mapping\Loader\AbstractLoader; @@ -88,7 +89,9 @@ protected function isApplicable($className, $fieldName) { $extendConfig = $this->extendConfigProvider->getConfig($className, $fieldName); - return !$extendConfig->is('is_deleted') && $extendConfig->is('is_extend'); + return !$extendConfig->is('is_deleted') && + !$extendConfig->is('state', ExtendScope::STATE_NEW) && + $extendConfig->is('is_extend'); } /** From 1d7e6b99661442185ae15fc2638781a0d2670840 Mon Sep 17 00:00:00 2001 From: Ivan Shakuta Date: Wed, 19 Nov 2014 19:56:11 +0200 Subject: [PATCH 05/27] BAP-5906: Validation for extended entities - fix validation loader in case when field is new --- .../Validator/ExtendFieldValidationLoader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php b/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php index e1dc4fc7a47..4d072d3107f 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php +++ b/src/Oro/Bundle/EntityExtendBundle/Validator/ExtendFieldValidationLoader.php @@ -2,10 +2,10 @@ namespace Oro\Bundle\EntityExtendBundle\Validator; -use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Mapping\Loader\AbstractLoader; +use Oro\Bundle\EntityExtendBundle\EntityConfig\ExtendScope; use Oro\Bundle\EntityConfigBundle\Config\Id\FieldConfigId; use Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider; From df593aaf03fa681417522e618d9abdd639a688d1 Mon Sep 17 00:00:00 2001 From: Sergey Zhuravel Date: Fri, 21 Nov 2014 17:52:29 +0200 Subject: [PATCH 06/27] OC-442: Few translation fixes - remove container - fix test --- .../Resources/config/services.yml | 3 +- .../Tests/Unit/Twig/SidebarExtensionTest.php | 51 ++++++++++++++----- .../SidebarBundle/Twig/SidebarExtension.php | 34 ++++++++----- 3 files changed, 61 insertions(+), 27 deletions(-) diff --git a/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml b/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml index 48fd709f757..33608ca7629 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml @@ -12,6 +12,7 @@ services: class: %oro_sidebar.twig.extension.class% arguments: - @oro_sidebar.widget_definition.registry - - @service_container + - @templating.helper.assets= + - @translator tags: - { name: twig.extension } diff --git a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php index b37384bee0a..00f0536bb19 100644 --- a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php +++ b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php @@ -3,19 +3,29 @@ namespace Oro\Bundle\SidebarBundle\Tests\Unit\Twig; use Doctrine\Common\Collections\ArrayCollection; + +use Symfony\Component\Templating\Asset\PackageInterface; +use Symfony\Component\Translation\TranslatorInterface; + +use Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry; use Oro\Bundle\SidebarBundle\Twig\SidebarExtension; class SidebarExtensionTest extends \PHPUnit_Framework_TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \PHPUnit_Framework_MockObject_MockObject|WidgetDefinitionRegistry */ protected $widgetDefinitionsRegistry; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var \PHPUnit_Framework_MockObject_MockObject|TranslatorInterface */ - protected $container; + protected $translator; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject|PackageInterface + */ + protected $assetHelper; /** * @var SidebarExtension @@ -28,14 +38,23 @@ protected function setUp() ->getMockBuilder('Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry') ->disableOriginalConstructor() ->getMock(); - $this->container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface') + + $this->translator = $this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface') ->disableOriginalConstructor() ->getMock(); - $this->extension = new SidebarExtension($this->widgetDefinitionsRegistry, $this->container); + + $this->assetHelper = $this->getMockBuilder('Symfony\Component\Templating\Asset\PackageInterface')->getMock(); + + $this->extension = new SidebarExtension( + $this->widgetDefinitionsRegistry, + $this->assetHelper, + $this->translator + ); } public function testGetFunctions() { + /** @var \Twig_SimpleFunction[] $functions */ $functions = $this->extension->getFunctions(); $this->assertCount(1, $functions); @@ -52,33 +71,37 @@ public function testGetName() public function testGetWidgetDefinitions() { $placement = 'left'; + $title = 'Foo'; $definitions = new ArrayCollection(); $definitions->set( 'test', array( - 'title' => 'Foo', + 'title' => $title, 'icon' => 'test.ico', 'module' => 'widget/foo', 'placement' => 'left' ) ); - $assetHelper = $this->getMockBuilder('Symfony\Component\Templating\Asset\PackageInterface') - ->getMock(); - $assetHelper->expects($this->once()) + + $this->assetHelper + ->expects($this->once()) ->method('getUrl') ->with('test.ico') ->will($this->returnValue('/asserts/test.ico')); - $this->container->expects($this->once()) - ->method('get') - ->with('templating.helper.assets') - ->will($this->returnValue($assetHelper)); + $this->widgetDefinitionsRegistry->expects($this->once()) ->method('getWidgetDefinitionsByPlacement') ->with($placement) ->will($this->returnValue($definitions)); + + $this->translator->expects($this->once()) + ->method('trans') + ->with($title) + ->will($this->returnValue('trans' . $title)); + $expected = array( 'test' => array( - 'title' => 'Foo', + 'title' => 'transFoo', 'icon' => '/asserts/test.ico', 'module' => 'widget/foo', 'placement' => 'left' diff --git a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php index 986ca5fc593..fc4c8dcfcd7 100644 --- a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php +++ b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php @@ -2,9 +2,10 @@ namespace Oro\Bundle\SidebarBundle\Twig; -use Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Templating\Asset\PackageInterface; +use Symfony\Component\Translation\TranslatorInterface; + +use Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry; class SidebarExtension extends \Twig_Extension { @@ -16,18 +17,28 @@ class SidebarExtension extends \Twig_Extension protected $widgetDefinitionsRegistry; /** - * @var ContainerInterface + * @var PackageInterface + */ + protected $assetHelper; + + /** + * @var TranslatorInterface */ - protected $container; + protected $translator; /** * @param WidgetDefinitionRegistry $widgetDefinitionsRegistry - * @param ContainerInterface $container + * @param PackageInterface $assetHelper + * @param TranslatorInterface $translator */ - public function __construct(WidgetDefinitionRegistry $widgetDefinitionsRegistry, ContainerInterface $container) - { + public function __construct( + WidgetDefinitionRegistry $widgetDefinitionsRegistry, + PackageInterface $assetHelper, + TranslatorInterface $translator + ) { $this->widgetDefinitionsRegistry = $widgetDefinitionsRegistry; - $this->container = $container; + $this->assetHelper = $assetHelper; + $this->translator = $translator; } /** @@ -49,15 +60,14 @@ public function getFunctions() public function getWidgetDefinitions($placement) { /** @var PackageInterface $assetHelper */ - $assetHelper =$this->container->get('templating.helper.assets'); $definitions = $this->widgetDefinitionsRegistry ->getWidgetDefinitionsByPlacement($placement) ->toArray(); - $translator = $this->container->get('translator'); foreach ($definitions as &$definition) { - $definition['icon'] = $assetHelper->getUrl($definition['icon']); - $definition['title'] = $translator->trans($definition['title']); + $definition['icon'] = $this->assetHelper->getUrl($definition['icon']); + $definition['title'] = $this->translator->trans($definition['title']); } + return $definitions; } From 048fe81c24b707d0d2385277f6482d5b3a431615 Mon Sep 17 00:00:00 2001 From: Sergey Zhuravel Date: Fri, 21 Nov 2014 20:07:43 +0200 Subject: [PATCH 07/27] OC-442: Few translation fixes - refactor extension - add handler --- .../EventListener/RequestHandler.php | 53 ++++++++++++ .../Model/WidgetDefinitionRegistry.php | 10 ++- .../Resources/config/services.yml | 10 ++- .../Unit/EventListener/RequestHandlerTest.php | 81 +++++++++++++++++++ .../Model/WidgetDefinitionRegistryTest.php | 7 ++ .../Tests/Unit/Twig/SidebarExtensionTest.php | 21 ++--- .../SidebarBundle/Twig/SidebarExtension.php | 12 +-- 7 files changed, 166 insertions(+), 28 deletions(-) create mode 100644 src/Oro/Bundle/SidebarBundle/EventListener/RequestHandler.php create mode 100644 src/Oro/Bundle/SidebarBundle/Tests/Unit/EventListener/RequestHandlerTest.php diff --git a/src/Oro/Bundle/SidebarBundle/EventListener/RequestHandler.php b/src/Oro/Bundle/SidebarBundle/EventListener/RequestHandler.php new file mode 100644 index 00000000000..da839219217 --- /dev/null +++ b/src/Oro/Bundle/SidebarBundle/EventListener/RequestHandler.php @@ -0,0 +1,53 @@ +widgetDefinitionsRegistry = $widgetDefinitionsRegistry; + $this->assetHelper = $assetHelper; + } + + /** + * @param GetResponseEvent $event + */ + public function onKernelRequest(GetResponseEvent $event) + { + $definitions = $this->widgetDefinitionsRegistry->getWidgetDefinitions(); + + if ($definitions->isEmpty()) { + return; + } + + $definitions = $definitions->toArray(); + + foreach ($definitions as &$definition) { + if (!empty($definition['icon'])) { + $definition['icon'] = $this->assetHelper->getUrl($definition['icon']); + } + } + + $this->widgetDefinitionsRegistry->setWidgetDefinitions($definitions); + } +} diff --git a/src/Oro/Bundle/SidebarBundle/Model/WidgetDefinitionRegistry.php b/src/Oro/Bundle/SidebarBundle/Model/WidgetDefinitionRegistry.php index 613c3e35dd2..172d005b389 100644 --- a/src/Oro/Bundle/SidebarBundle/Model/WidgetDefinitionRegistry.php +++ b/src/Oro/Bundle/SidebarBundle/Model/WidgetDefinitionRegistry.php @@ -24,13 +24,21 @@ public function __construct(array $definitions) /** * @param array $definitions */ - protected function setWidgetDefinitions(array $definitions) + public function setWidgetDefinitions(array $definitions) { foreach ($definitions as $name => $definition) { $this->widgetDefinitions->set($name, $definition); } } + /** + * @return ArrayCollection + */ + public function getWidgetDefinitions() + { + return $this->widgetDefinitions; + } + /** * @param string $placement * @return ArrayCollection diff --git a/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml b/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml index 33608ca7629..3c63abe6b7a 100644 --- a/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/SidebarBundle/Resources/config/services.yml @@ -1,6 +1,7 @@ parameters: oro_sidebar.widget_definition.registry.class: Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry oro_sidebar.twig.extension.class: Oro\Bundle\SidebarBundle\Twig\SidebarExtension + oro_sidebar.request.handler.class: Oro\Bundle\SidebarBundle\EventListener\RequestHandler services: oro_sidebar.widget_definition.registry: @@ -12,7 +13,14 @@ services: class: %oro_sidebar.twig.extension.class% arguments: - @oro_sidebar.widget_definition.registry - - @templating.helper.assets= - @translator tags: - { name: twig.extension } + + oro_sidebar.request.handler: + class: %oro_sidebar.request.handler.class% + arguments: + - @oro_sidebar.widget_definition.registry + - @templating.helper.assets= + tags: + - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest } diff --git a/src/Oro/Bundle/SidebarBundle/Tests/Unit/EventListener/RequestHandlerTest.php b/src/Oro/Bundle/SidebarBundle/Tests/Unit/EventListener/RequestHandlerTest.php new file mode 100644 index 00000000000..16bc385210b --- /dev/null +++ b/src/Oro/Bundle/SidebarBundle/Tests/Unit/EventListener/RequestHandlerTest.php @@ -0,0 +1,81 @@ +widgetDefinitionsRegistry = $this + ->getMockBuilder('Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry') + ->disableOriginalConstructor() + ->getMock(); + + $this->assetHelper = $this->getMockBuilder('Symfony\Component\Templating\Asset\PackageInterface')->getMock(); + + $this->handler = new RequestHandler($this->widgetDefinitionsRegistry, $this->assetHelper); + } + + /** + * @param array $definitions + * @param bool $expects + * + * @dataProvider definitionDataProvider + */ + public function testOnKernelRequest(array $definitions, $expects) + { + /** @var GetResponseEvent $event */ + $event = $this + ->getMockBuilder('Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $this->widgetDefinitionsRegistry->expects($this->once()) + ->method('getWidgetDefinitions') + ->will($this->returnValue(new ArrayCollection($definitions))); + + if ($expects) { + $this->assetHelper->expects($this->exactly($expects)) + ->method('getUrl') + ->with($this->isType('string')); + } + + $this->handler->onKernelRequest($event); + } + + /** + * @return array + */ + public function definitionDataProvider() + { + return [ + 'empty' => [[], 0], + 'without icon' => [[['name' => 'widget']], 0], + 'with icon' => [[['icon' => 'icon.png']], 1], + 'two with icon' => [[['icon' => 'icon.png'], ['name' => 'widget']], 1], + 'two with icons' => [[['icon' => 'icon.png'], ['icon' => 'widget.png']], 2], + ]; + } +} diff --git a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Model/WidgetDefinitionRegistryTest.php b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Model/WidgetDefinitionRegistryTest.php index f761d2205ac..843b79f12ef 100644 --- a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Model/WidgetDefinitionRegistryTest.php +++ b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Model/WidgetDefinitionRegistryTest.php @@ -18,6 +18,13 @@ public function testGetWidgetDefinitionsByPlacement(array $definitions, $placeme $actual = $registry->getWidgetDefinitionsByPlacement($placement); $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $actual); $this->assertEquals($expected, $actual->toArray()); + + $additionalDefinition = ['last' => ['icon' => 'icon.png']]; + $registry->setWidgetDefinitions($additionalDefinition); + $this->assertEquals( + array_merge($definitions, $additionalDefinition), + $registry->getWidgetDefinitions()->toArray() + ); } /** diff --git a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php index 00f0536bb19..7c7aff3403c 100644 --- a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php +++ b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php @@ -4,7 +4,6 @@ use Doctrine\Common\Collections\ArrayCollection; -use Symfony\Component\Templating\Asset\PackageInterface; use Symfony\Component\Translation\TranslatorInterface; use Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry; @@ -22,11 +21,6 @@ class SidebarExtensionTest extends \PHPUnit_Framework_TestCase */ protected $translator; - /** - * @var \PHPUnit_Framework_MockObject_MockObject|PackageInterface - */ - protected $assetHelper; - /** * @var SidebarExtension */ @@ -43,11 +37,8 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->assetHelper = $this->getMockBuilder('Symfony\Component\Templating\Asset\PackageInterface')->getMock(); - $this->extension = new SidebarExtension( $this->widgetDefinitionsRegistry, - $this->assetHelper, $this->translator ); } @@ -83,11 +74,11 @@ public function testGetWidgetDefinitions() ) ); - $this->assetHelper - ->expects($this->once()) - ->method('getUrl') - ->with('test.ico') - ->will($this->returnValue('/asserts/test.ico')); +// $this->assetHelper +// ->expects($this->once()) +// ->method('getUrl') +// ->with('test.ico') +// ->will($this->returnValue('/asserts/test.ico')); $this->widgetDefinitionsRegistry->expects($this->once()) ->method('getWidgetDefinitionsByPlacement') @@ -102,7 +93,7 @@ public function testGetWidgetDefinitions() $expected = array( 'test' => array( 'title' => 'transFoo', - 'icon' => '/asserts/test.ico', + 'icon' => 'test.ico', 'module' => 'widget/foo', 'placement' => 'left' ) diff --git a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php index fc4c8dcfcd7..6f6863d371c 100644 --- a/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php +++ b/src/Oro/Bundle/SidebarBundle/Twig/SidebarExtension.php @@ -2,7 +2,6 @@ namespace Oro\Bundle\SidebarBundle\Twig; -use Symfony\Component\Templating\Asset\PackageInterface; use Symfony\Component\Translation\TranslatorInterface; use Oro\Bundle\SidebarBundle\Model\WidgetDefinitionRegistry; @@ -16,11 +15,6 @@ class SidebarExtension extends \Twig_Extension */ protected $widgetDefinitionsRegistry; - /** - * @var PackageInterface - */ - protected $assetHelper; - /** * @var TranslatorInterface */ @@ -28,16 +22,13 @@ class SidebarExtension extends \Twig_Extension /** * @param WidgetDefinitionRegistry $widgetDefinitionsRegistry - * @param PackageInterface $assetHelper * @param TranslatorInterface $translator */ public function __construct( WidgetDefinitionRegistry $widgetDefinitionsRegistry, - PackageInterface $assetHelper, TranslatorInterface $translator ) { $this->widgetDefinitionsRegistry = $widgetDefinitionsRegistry; - $this->assetHelper = $assetHelper; $this->translator = $translator; } @@ -59,12 +50,11 @@ public function getFunctions() */ public function getWidgetDefinitions($placement) { - /** @var PackageInterface $assetHelper */ $definitions = $this->widgetDefinitionsRegistry ->getWidgetDefinitionsByPlacement($placement) ->toArray(); + foreach ($definitions as &$definition) { - $definition['icon'] = $this->assetHelper->getUrl($definition['icon']); $definition['title'] = $this->translator->trans($definition['title']); } From 758a29e018abd13aaff681fe409f7015a514c219 Mon Sep 17 00:00:00 2001 From: Sergey Zhuravel Date: Fri, 21 Nov 2014 20:13:52 +0200 Subject: [PATCH 08/27] OC-442: Few translation fixes - cs --- .../SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php index 7c7aff3403c..2f636f12917 100644 --- a/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php +++ b/src/Oro/Bundle/SidebarBundle/Tests/Unit/Twig/SidebarExtensionTest.php @@ -74,12 +74,6 @@ public function testGetWidgetDefinitions() ) ); -// $this->assetHelper -// ->expects($this->once()) -// ->method('getUrl') -// ->with('test.ico') -// ->will($this->returnValue('/asserts/test.ico')); - $this->widgetDefinitionsRegistry->expects($this->once()) ->method('getWidgetDefinitionsByPlacement') ->with($placement) From c07fc8d16e3a0c33a85e9ee6901e709a0481d316 Mon Sep 17 00:00:00 2001 From: Ivan Shakuta Date: Mon, 24 Nov 2014 14:41:31 +0200 Subject: [PATCH 09/27] BAP-5380: Implement form type guessers for custom fields of existing entities - fix CR --- .../Form/Guesser/AbstractFormGuesser.php | 24 +++++++++++-------- .../Form/Guesser/FormConfigGuesser.php | 6 ++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php b/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php index 26654876262..264ceea81b8 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php +++ b/src/Oro/Bundle/EntityBundle/Form/Guesser/AbstractFormGuesser.php @@ -24,12 +24,12 @@ abstract class AbstractFormGuesser implements FormTypeGuesserInterface protected $entityConfigProvider; /** - * @param ManagerRegistry $managerRegistry + * @param ManagerRegistry $managerRegistry * @param ConfigProviderInterface $entityConfigProvider */ public function __construct(ManagerRegistry $managerRegistry, ConfigProviderInterface $entityConfigProvider) { - $this->managerRegistry = $managerRegistry; + $this->managerRegistry = $managerRegistry; $this->entityConfigProvider = $entityConfigProvider; } @@ -59,6 +59,7 @@ public function guessPattern($class, $property) /** * @param string $class + * * @return ClassMetadata|null */ protected function getMetadataForClass($class) @@ -75,12 +76,14 @@ protected function getMetadataForClass($class) * @param string $formType * @param array $formOptions * @param int $confidence + * * @return TypeGuess */ - protected function createTypeGuess($formType, array $formOptions = array(), $confidence = null) - { - $confidence = is_null($confidence) ? TypeGuess::HIGH_CONFIDENCE : $confidence; - + protected function createTypeGuess( + $formType, + array $formOptions = array(), + $confidence = TypeGuess::HIGH_CONFIDENCE + ) { return new TypeGuess($formType, $formOptions, $confidence); } @@ -93,10 +96,11 @@ protected function createDefaultTypeGuess() } /** - * @param array $options - * @param string $class + * @param array $options + * @param string $class * @param string|null $field - * @param bool $multiple + * @param bool $multiple + * * @return array */ protected function addLabelOption(array $options, $class, $field = null, $multiple = false) @@ -106,7 +110,7 @@ protected function addLabelOption(array $options, $class, $field = null, $multip } $entityConfig = $this->entityConfigProvider->getConfig($class, $field); - $labelOption = $multiple ? 'plural_label' : 'label'; + $labelOption = $multiple ? 'plural_label' : 'label'; if ($entityConfig->has($labelOption)) { $options['label'] = $entityConfig->get($labelOption); } diff --git a/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php b/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php index b9c7d462e93..ff8951b8e45 100644 --- a/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php +++ b/src/Oro/Bundle/EntityBundle/Form/Guesser/FormConfigGuesser.php @@ -72,8 +72,8 @@ protected function getTypeGuess(ConfigInterface $formConfig, $class, $property) $formOptions = $this->addLabelOption($formOptions, $class, $property); // fallback guess from recursive call must be with low confidence - $confidence = is_null($property) ? TypeGuess::LOW_CONFIDENCE : null; - - return $this->createTypeGuess($formType, $formOptions, $confidence); + return is_null($property) ? + $this->createTypeGuess($formType, $formOptions, TypeGuess::LOW_CONFIDENCE) : + $this->createTypeGuess($formType, $formOptions); } } From 4ee62bf134159a3c0f9523b0e1a98026cb8e7f8b Mon Sep 17 00:00:00 2001 From: Vova Soroka Date: Sat, 22 Nov 2014 09:55:28 +0200 Subject: [PATCH 10/27] BAP-5873: Add support of cascade option for association in Extend Extension --- .../FileEntityConfigDumperExtensionTest.php | 66 ++++- .../Tools/FileEntityConfigDumperExtension.php | 20 +- .../Resources/config/entity_config.yml | 11 + ...elationEntityConfigDumperExtensionTest.php | 268 ++++++++++++++++++ .../Tests/Unit/Tools/RelationBuilderTest.php | 224 ++++++++++++++- .../RelationEntityConfigDumperExtension.php | 5 + .../Tools/RelationBuilder.php | 6 + 7 files changed, 580 insertions(+), 20 deletions(-) diff --git a/src/Oro/Bundle/AttachmentBundle/Tests/Unit/Tools/FileEntityConfigDumperExtensionTest.php b/src/Oro/Bundle/AttachmentBundle/Tests/Unit/Tools/FileEntityConfigDumperExtensionTest.php index c7a7df7e038..b8fc303c17c 100644 --- a/src/Oro/Bundle/AttachmentBundle/Tests/Unit/Tools/FileEntityConfigDumperExtensionTest.php +++ b/src/Oro/Bundle/AttachmentBundle/Tests/Unit/Tools/FileEntityConfigDumperExtensionTest.php @@ -76,9 +76,6 @@ public function testPreUpdate($fieldType) ] ) ); - $extendConfigProvider->expects($this->once()) - ->method('persist') - ->with($this->identicalTo($entityConfig)); $this->configManager->expects($this->once()) ->method('getProvider') @@ -94,6 +91,9 @@ public function testPreUpdate($fieldType) $fieldName, 'id', [ + 'extend' => [ + 'cascade' => ['persist'] + ], 'importexport' => [ 'process_as_scalar' => true ] @@ -103,11 +103,63 @@ public function testPreUpdate($fieldType) ->will($this->returnValue($relationKey)); $this->extension->preUpdate(); + } - $this->assertEquals( - ['persist'], - $entityConfig->get('relation')[$relationKey]['cascade'] - ); + /** + * @dataProvider preUpdateProvider + */ + public function testPreUpdateWithCascade($fieldType) + { + $entityClass = 'Test\Entity'; + $fieldName = 'test_field'; + + $entityConfig = new Config(new EntityConfigId('extend', $entityClass)); + $entityConfig->set('is_extend', true); + + $fieldConfig = new Config(new FieldConfigId('extend', $entityClass, $fieldName, $fieldType)); + $fieldConfig->set('state', ExtendScope::STATE_NEW); + $fieldConfig->set('cascade', ['persist', 'remove']); + + $extendConfigProvider = $this->getMockBuilder('Oro\Bundle\EntityConfigBundle\Provider\ConfigProvider') + ->disableOriginalConstructor() + ->getMock(); + $extendConfigProvider->expects($this->exactly(2)) + ->method('getConfigs') + ->will( + $this->returnValueMap( + [ + [null, false, [$entityConfig]], + [$entityClass, false, [$fieldConfig]], + ] + ) + ); + + $this->configManager->expects($this->once()) + ->method('getProvider') + ->with('extend') + ->will($this->returnValue($extendConfigProvider)); + + $relationKey = 'test_relation_key'; + $this->relationBuilder->expects($this->once()) + ->method('addManyToOneRelation') + ->with( + $this->identicalTo($entityConfig), + 'Oro\Bundle\AttachmentBundle\Entity\File', + $fieldName, + 'id', + [ + 'extend' => [ + 'cascade' => ['persist', 'remove'] + ], + 'importexport' => [ + 'process_as_scalar' => true + ] + ], + $fieldType + ) + ->will($this->returnValue($relationKey)); + + $this->extension->preUpdate(); } public function preUpdateProvider() diff --git a/src/Oro/Bundle/AttachmentBundle/Tools/FileEntityConfigDumperExtension.php b/src/Oro/Bundle/AttachmentBundle/Tools/FileEntityConfigDumperExtension.php index 63e06d58816..9f068bd4527 100644 --- a/src/Oro/Bundle/AttachmentBundle/Tools/FileEntityConfigDumperExtension.php +++ b/src/Oro/Bundle/AttachmentBundle/Tools/FileEntityConfigDumperExtension.php @@ -58,29 +58,25 @@ public function preUpdate() /** @var FieldConfigId $fieldConfigId */ $fieldConfigId = $fieldConfig->getId(); if (in_array($fieldConfigId->getFieldType(), ['file', 'image'])) { - // create a relation - $relationKey = $this->relationBuilder->addManyToOneRelation( + $cascade = $fieldConfig->get('cascade', false, []); + if (!in_array('persist', $cascade, true)) { + $cascade[] = 'persist'; + } + $this->relationBuilder->addManyToOneRelation( $entityConfig, 'Oro\Bundle\AttachmentBundle\Entity\File', $fieldConfigId->getFieldName(), 'id', [ + 'extend' => [ + 'cascade' => $cascade + ], 'importexport' => [ 'process_as_scalar' => true ] ], $fieldConfigId->getFieldType() ); - - // set cascade persist - $relations = $entityConfig->get('relation'); - $cascade = isset($relations[$relationKey]['cascade']) - ? $relations[$relationKey]['cascade'] - : []; - $cascade[] = 'persist'; - $relations[$relationKey]['cascade'] = $cascade; - $entityConfig->set('relation', $relations); - $extendConfigProvider->persist($entityConfig); } } } diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/config/entity_config.yml b/src/Oro/Bundle/EntityExtendBundle/Resources/config/entity_config.yml index 0d1e07cfafb..c01988295cf 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Resources/config/entity_config.yml +++ b/src/Oro/Bundle/EntityExtendBundle/Resources/config/entity_config.yml @@ -328,6 +328,17 @@ oro_entity_config: options: auditable: false + # the names of persistence operations to cascade on the relation. + # the set of possible values are: 'persist', 'remove', 'detach', 'merge', 'refresh', 'all' + # for example: ['persist', 'remove'] + # see Doctrine's documentation for more details + # note that for many-to-one and one-to-many relations the 'detach' operation is applied by default + # and this cannot be changed through the config + # this attribute is applicable to any type of relations + cascade: # array of strings + options: + auditable: false + # OptionSet form type fields # @deprecated since 1.4, will be removed in 2.0 set_expanded: diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/DumperExtensions/RelationEntityConfigDumperExtensionTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/DumperExtensions/RelationEntityConfigDumperExtensionTest.php index c6f53662394..4768baa5339 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/DumperExtensions/RelationEntityConfigDumperExtensionTest.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/DumperExtensions/RelationEntityConfigDumperExtensionTest.php @@ -210,6 +210,99 @@ public function testCreateSelfRelationOneToMany() ); } + /** + * Test create new field (relation type [1:*] + cascade option) + */ + public function testCreateSelfRelationOneToManyWithCascade() + { + $config = new Config(new EntityConfigId('extend', 'TestClass')); + $config->set('is_extend', true); + + $fieldsConfigs = [ + $this->getConfigNewField( + [ + 'state' => ExtendScope::STATE_NEW, + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'cascade' => ['persist', 'remove'] + ], + 'oneToMany' + ), + ]; + + $selfConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + $targetConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + + $this->extendConfigProvider->expects($this->any()) + ->method('getConfigs') + ->will( + $this->returnValueMap( + [ + [null, false, [$config]], + ['TestClass', false, $fieldsConfigs], + ] + ) + ); + $this->extendConfigProvider->expects($this->any()) + ->method('getConfig') + ->will( + $this->returnValueMap( + [ + ['TestClass', null, $selfConfig], + ['Oro\Bundle\UserBundle\Entity\User', null, $targetConfig], + ] + ) + ); + + $this->extension->preUpdate(); + + $this->assertEquals( + [ + 'oneToMany|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'field_id' => new FieldConfigId( + 'extend', + 'Oro\Bundle\UserBundle\Entity\User', + 'testclass_testFieldName', + 'manyToOne' + ), + 'owner' => true, + 'target_entity' => 'TestClass', + 'target_field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'oneToMany' + ) + ], + ], + $targetConfig->get('relation') + ); + + $this->assertEquals( + [ + 'oneToMany|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'oneToMany' + ), + 'owner' => false, + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'target_field_id' => new FieldConfigId( + 'extend', + 'Oro\Bundle\UserBundle\Entity\User', + 'testclass_testFieldName', + 'manyToOne' + ), + 'cascade' => ['persist', 'remove'] + ], + ], + $selfConfig->get('relation') + ); + } + /** * Test create new field (relation type [*:1]) */ @@ -291,6 +384,89 @@ public function testCreateSelfRelationManyToOne() ); } + /** + * Test create new field (relation type [*:1] + cascade option) + */ + public function testCreateSelfRelationManyToOneWithCascade() + { + $config = new Config(new EntityConfigId('extend', 'TestClass')); + $config->set('is_extend', true); + + $fieldsConfigs = [ + $this->getConfigNewField( + [ + 'state' => ExtendScope::STATE_NEW, + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'cascade' => ['persist', 'remove'] + ], + 'manyToOne' + ), + ]; + + $selfConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + $targetConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + + $this->extendConfigProvider->expects($this->any()) + ->method('getConfigs') + ->will( + $this->returnValueMap( + [ + [null, false, [$config]], + ['TestClass', false, $fieldsConfigs], + ] + ) + ); + $this->extendConfigProvider->expects($this->any()) + ->method('getConfig') + ->will( + $this->returnValueMap( + [ + ['TestClass', null, $selfConfig], + ['Oro\Bundle\UserBundle\Entity\User', null, $targetConfig], + ] + ) + ); + + $this->extension->preUpdate(); + + $this->assertEquals( + [ + 'manyToOne|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'field_id' => false, + 'owner' => false, + 'target_entity' => 'TestClass', + 'target_field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'manyToOne' + ), + ], + ], + $targetConfig->get('relation') + ); + + $this->assertEquals( + [ + 'manyToOne|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'manyToOne' + ), + 'owner' => true, + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'target_field_id' => false, + 'cascade' => ['persist', 'remove'] + ], + ], + $selfConfig->get('relation') + ); + } + /** * Test create new field (relation type [*:*]) */ @@ -381,6 +557,98 @@ public function testCreateSelfRelationManyToMany() ); } + /** + * Test create new field (relation type [*:*] + cascade option) + */ + public function testCreateSelfRelationManyToManyWithCascade() + { + $config = new Config(new EntityConfigId('extend', 'TestClass')); + $config->set('is_extend', true); + + $fieldsConfigs = [ + $this->getConfigNewField( + [ + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'cascade' => ['persist', 'remove'] + ], + 'manyToMany' + ), + ]; + + $selfConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + $targetConfig = $this->getEntityConfig(['state' => ExtendScope::STATE_ACTIVE]); + + $this->extendConfigProvider->expects($this->any()) + ->method('getConfigs') + ->will( + $this->returnValueMap( + [ + [null, false, [$config]], + ['TestClass', false, $fieldsConfigs], + ] + ) + ); + $this->extendConfigProvider->expects($this->any()) + ->method('getConfig') + ->will( + $this->returnValueMap( + [ + ['TestClass', null, $selfConfig], + ['Oro\Bundle\UserBundle\Entity\User', null, $targetConfig], + ] + ) + ); + + $this->extension->preUpdate(); + + $this->assertEquals( + [ + 'manyToMany|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'owner' => false, + 'field_id' => new FieldConfigId( + 'extend', + 'Oro\Bundle\UserBundle\Entity\User', + 'testclass_testFieldName', + 'manyToMany' + ), + 'target_entity' => 'TestClass', + 'target_field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'manyToMany' + ), + ], + ], + $targetConfig->get('relation') + ); + + $this->assertEquals( + [ + 'manyToMany|TestClass|Oro\Bundle\UserBundle\Entity\User|testFieldName' => [ + 'assign' => false, + 'field_id' => new FieldConfigId( + 'extend', + 'TestClass', + 'testFieldName', + 'manyToMany' + ), + 'owner' => true, + 'target_entity' => 'Oro\Bundle\UserBundle\Entity\User', + 'target_field_id' => new FieldConfigId( + 'extend', + 'Oro\Bundle\UserBundle\Entity\User', + 'testclass_testFieldName', + 'manyToMany' + ), + 'cascade' => ['persist', 'remove'] + ], + ], + $selfConfig->get('relation') + ); + } + /** * Test create new field (relation type [*:*]) */ diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php index 50afdf9c648..b06dfe6786c 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php @@ -119,7 +119,7 @@ public function testAddManyToOneRelationForNewRelation() $targetFieldName, [ 'extend' => [ - 'owner' => ExtendScope::OWNER_CUSTOM + 'owner' => ExtendScope::OWNER_CUSTOM, ], 'test' => [ 'test_attr' => 123 @@ -243,6 +243,228 @@ public function testAddManyToManyRelationForNewRelation() $this->assertEquals($expectedTestFieldConfig, $testFieldConfig); } + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testAddManyToOneRelationWithCascade() + { + $relationName = 'testRelation'; + $relationKey = 'manyToOne|Test\SourceEntity|Test\TargetEntity|testRelation'; + $targetFieldName = 'field1'; + + $extendConfig = new Config(new EntityConfigId('extend', self::SOURCE_CLASS)); + $extendFieldConfig = new Config(new FieldConfigId('extend', self::SOURCE_CLASS, $relationName, 'manyToOne')); + $testFieldConfig = new Config(new FieldConfigId('test', self::SOURCE_CLASS, $relationName, 'manyToOne')); + + $expectedExtendConfig = new Config($extendConfig->getId()); + $expectedExtendConfig->set( + 'relation', + [ + $relationKey => [ + 'assign' => false, + 'field_id' => new FieldConfigId('extend', self::SOURCE_CLASS, $relationName, 'manyToOne'), + 'owner' => true, + 'target_entity' => self::TARGET_CLASS, + 'target_field_id' => false, + 'cascade' => ['persist', 'remove'] + ] + ] + ); + + $expectedExtendFieldConfig = new Config($extendFieldConfig->getId()); + $expectedExtendFieldConfig->setValues( + [ + 'owner' => ExtendScope::OWNER_CUSTOM, + 'is_extend' => true, + 'state' => ExtendScope::STATE_NEW, + 'relation_key' => $relationKey, + 'target_entity' => self::TARGET_CLASS, + 'target_field' => $targetFieldName, + 'cascade' => ['persist', 'remove'] + ] + ); + + $expectedTestFieldConfig = new Config($testFieldConfig->getId()); + $expectedTestFieldConfig->setValues( + [ + 'test_attr' => 123 + ] + ); + + $extendConfigProvider = $this->getConfigProviderMock(); + $extendConfigProvider->expects($this->once()) + ->method('getConfig') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue($extendFieldConfig)); + $extendConfigProvider->expects($this->at(1)) + ->method('persist') + ->with($this->identicalTo($extendFieldConfig)); + $extendConfigProvider->expects($this->at(2)) + ->method('persist') + ->with($this->identicalTo($extendConfig)); + + $testConfigProvider = $this->getConfigProviderMock(); + $testConfigProvider->expects($this->once()) + ->method('getConfig') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue($testFieldConfig)); + $testConfigProvider->expects($this->once()) + ->method('persist') + ->with($this->identicalTo($testFieldConfig)); + + $this->configManager->expects($this->once()) + ->method('hasConfigFieldModel') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue(false)); + $this->configManager->expects($this->once()) + ->method('createConfigFieldModel') + ->with(self::SOURCE_CLASS, $relationName, 'manyToOne'); + $this->configManager->expects($this->any()) + ->method('getProvider') + ->will( + $this->returnValueMap( + [ + ['extend', $extendConfigProvider], + ['test', $testConfigProvider], + ] + ) + ); + + $this->builder->addManyToOneRelation( + $extendConfig, + self::TARGET_CLASS, + $relationName, + $targetFieldName, + [ + 'extend' => [ + 'owner' => ExtendScope::OWNER_CUSTOM, + 'cascade' => ['persist', 'remove'] + ], + 'test' => [ + 'test_attr' => 123 + ] + ] + ); + + $this->assertEquals($expectedExtendConfig, $extendConfig); + $this->assertEquals($expectedExtendFieldConfig, $extendFieldConfig); + $this->assertEquals($expectedTestFieldConfig, $testFieldConfig); + } + + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testAddManyToManyRelationWithCascade() + { + $relationName = 'testRelation'; + $relationKey = 'manyToMany|Test\SourceEntity|Test\TargetEntity|testRelation'; + $targetTitleFieldName = 'field1'; + $targetDetailedFieldName = 'field2'; + $targetGridFieldName = 'field3'; + + $extendConfig = new Config(new EntityConfigId('extend', self::SOURCE_CLASS)); + $extendFieldConfig = new Config(new FieldConfigId('extend', self::SOURCE_CLASS, $relationName, 'manyToMany')); + $testFieldConfig = new Config(new FieldConfigId('test', self::SOURCE_CLASS, $relationName, 'manyToOne')); + + $expectedExtendConfig = new Config(new EntityConfigId('extend', self::SOURCE_CLASS)); + $expectedExtendConfig->set( + 'relation', + [ + $relationKey => [ + 'assign' => false, + 'field_id' => new FieldConfigId('extend', self::SOURCE_CLASS, $relationName, 'manyToMany'), + 'owner' => true, + 'target_entity' => self::TARGET_CLASS, + 'target_field_id' => false, + 'cascade' => ['persist', 'remove'] + ] + ] + ); + + $expectedExtendFieldConfig = new Config($extendFieldConfig->getId()); + $expectedExtendFieldConfig->setValues( + [ + 'owner' => ExtendScope::OWNER_CUSTOM, + 'is_extend' => true, + 'state' => ExtendScope::STATE_NEW, + 'relation_key' => $relationKey, + 'target_entity' => self::TARGET_CLASS, + 'target_title' => [$targetTitleFieldName], + 'target_detailed' => [$targetDetailedFieldName], + 'target_grid' => [$targetGridFieldName], + 'cascade' => ['persist', 'remove'] + ] + ); + + $expectedTestFieldConfig = new Config($testFieldConfig->getId()); + $expectedTestFieldConfig->setValues( + [ + 'test_attr' => 123 + ] + ); + + $extendConfigProvider = $this->getConfigProviderMock(); + $extendConfigProvider->expects($this->once()) + ->method('getConfig') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue($extendFieldConfig)); + $extendConfigProvider->expects($this->at(1)) + ->method('persist') + ->with($this->identicalTo($extendFieldConfig)); + $extendConfigProvider->expects($this->at(2)) + ->method('persist') + ->with($this->identicalTo($extendConfig)); + + $testConfigProvider = $this->getConfigProviderMock(); + $testConfigProvider->expects($this->once()) + ->method('getConfig') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue($testFieldConfig)); + $testConfigProvider->expects($this->once()) + ->method('persist') + ->with($this->identicalTo($testFieldConfig)); + + $this->configManager->expects($this->once()) + ->method('hasConfigFieldModel') + ->with(self::SOURCE_CLASS, $relationName) + ->will($this->returnValue(false)); + $this->configManager->expects($this->once()) + ->method('createConfigFieldModel') + ->with(self::SOURCE_CLASS, $relationName, 'manyToMany'); + $this->configManager->expects($this->any()) + ->method('getProvider') + ->will( + $this->returnValueMap( + [ + ['extend', $extendConfigProvider], + ['test', $testConfigProvider], + ] + ) + ); + + $this->builder->addManyToManyRelation( + $extendConfig, + self::TARGET_CLASS, + $relationName, + [$targetTitleFieldName], + [$targetDetailedFieldName], + [$targetGridFieldName], + [ + 'extend' => [ + 'owner' => ExtendScope::OWNER_CUSTOM, + 'cascade' => ['persist', 'remove'] + ], + 'test' => [ + 'test_attr' => 123 + ] + ] + ); + + $this->assertEquals($expectedExtendConfig, $extendConfig); + $this->assertEquals($expectedExtendFieldConfig, $extendFieldConfig); + $this->assertEquals($expectedTestFieldConfig, $testFieldConfig); + } + public function testAddManyToOneRelationForAlreadyExistRelationWithDifferentFieldType() { $relationName = 'testRelation'; diff --git a/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php b/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php index 27e0e1bf8f7..68c0c906e26 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php @@ -109,6 +109,8 @@ protected function createRelation(ConfigInterface $fieldConfig) /** * @param ConfigInterface $fieldConfig + * + * @SuppressWarnings(PHPMD.NPathComplexity) */ protected function createSelfRelation(ConfigInterface $fieldConfig) { @@ -162,6 +164,9 @@ protected function createSelfRelation(ConfigInterface $fieldConfig) 'target_entity' => $targetEntityClass, 'target_field_id' => $targetFieldId ]; + if ($fieldConfig->has('cascade')) { + $selfRelationConfig['cascade'] = $fieldConfig->get('cascade'); + } $selfRelations = $selfConfig->get('relation') ? : []; $selfRelations[$relationKey] = $selfRelationConfig; diff --git a/src/Oro/Bundle/EntityExtendBundle/Tools/RelationBuilder.php b/src/Oro/Bundle/EntityExtendBundle/Tools/RelationBuilder.php index 350919e6f97..cd392c5f906 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tools/RelationBuilder.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tools/RelationBuilder.php @@ -81,6 +81,9 @@ public function addManyToManyRelation( 'target_entity' => $targetEntityName, 'target_field_id' => false, ]; + if (isset($options['extend']['cascade'])) { + $relations[$relationKey]['cascade'] = $options['extend']['cascade']; + } $sourceEntityConfig->set('relation', $relations); $extendConfigProvider = $this->configManager->getProvider('extend'); @@ -145,6 +148,9 @@ public function addManyToOneRelation( 'target_entity' => $targetEntityName, 'target_field_id' => false ]; + if (isset($options['extend']['cascade'])) { + $relations[$relationKey]['cascade'] = $options['extend']['cascade']; + } $sourceEntityConfig->set('relation', $relations); $extendConfigProvider = $this->configManager->getProvider('extend'); From 5c42cd7a65c368412b126db3867b2cb750d9f998 Mon Sep 17 00:00:00 2001 From: Vova Soroka Date: Sat, 22 Nov 2014 10:00:07 +0200 Subject: [PATCH 11/27] BAP-5873: Add support of cascade option for association in Extend Extension. Fix CS --- .../EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php | 2 +- .../DumperExtensions/RelationEntityConfigDumperExtension.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php index b06dfe6786c..1fd621d1d63 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Tools/RelationBuilderTest.php @@ -119,7 +119,7 @@ public function testAddManyToOneRelationForNewRelation() $targetFieldName, [ 'extend' => [ - 'owner' => ExtendScope::OWNER_CUSTOM, + 'owner' => ExtendScope::OWNER_CUSTOM ], 'test' => [ 'test_attr' => 123 diff --git a/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php b/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php index 68c0c906e26..dfd8fca4a4e 100644 --- a/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php +++ b/src/Oro/Bundle/EntityExtendBundle/Tools/DumperExtensions/RelationEntityConfigDumperExtension.php @@ -109,8 +109,6 @@ protected function createRelation(ConfigInterface $fieldConfig) /** * @param ConfigInterface $fieldConfig - * - * @SuppressWarnings(PHPMD.NPathComplexity) */ protected function createSelfRelation(ConfigInterface $fieldConfig) { From d534d86c4913a7b874f616722d6c9b89112ca9ba Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Fri, 21 Nov 2014 17:14:50 +0200 Subject: [PATCH 12/27] CRM-2157 Duplicated jobs on two way Magento sync --- .../Command/ReverseSyncCommand.php | 2 + .../Manager/SyncScheduler.php | 53 +++++++++++++-- .../Tests/Unit/Manager/SyncSchedulerTest.php | 65 +++++++++++++++++-- 3 files changed, 109 insertions(+), 11 deletions(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php index 8762cf18e7c..b218c59f6cb 100644 --- a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php +++ b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php @@ -71,6 +71,8 @@ protected function execute(InputInterface $input, OutputInterface $output) ->getConfiguration() ->setSQLLogger(null); + $logger->notice('inter='.$integrationId . '; conn=' . $connectorType . '; param=' . $params); + if ($this->isJobRunning($integrationId, $connectorType, $params)) { $logger->warning('Job already running. Terminating....'); diff --git a/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php b/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php index ec9830cc7da..910dd9e225e 100644 --- a/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php +++ b/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php @@ -3,6 +3,7 @@ namespace Oro\Bundle\IntegrationBundle\Manager; use Doctrine\ORM\EntityManager; +use Doctrine\DBAL\Types\Type; use JMS\JobQueueBundle\Entity\Job; @@ -63,16 +64,54 @@ public function schedule(Integration $integration, $connectorType, $params = [], '--connector=' . $connectorType, '--params=' . serialize($params) ]; - $job = new Job(self::JOB_NAME, $args); - if ($useFlush) { + if ($this->hasNoSameJobs($args)) { + $this->addJob($args, $useFlush); + } + } + + /** + * @param array $args + * + * @return bool + */ + protected function hasNoSameJobs(array $args) + { + $qb = $this->em->createQueryBuilder(); + + $qb->select('j'); + $qb->from('JMSJobQueueBundle:Job', 'j'); + $qb->andWhere('j.command = :command'); + $qb->andWhere('j.args = :args'); + $qb->andWhere($qb->expr()->in('j.state', [Job::STATE_PENDING, Job::STATE_NEW])); + $qb->setParameter('command', self::JOB_NAME); + $qb->setParameter('args', $args, Type::JSON_ARRAY); + $qb->setMaxResults(1); + $result = $qb->getQuery()->getArrayResult(); + + return empty($result); + } + + /** + * @param array $args + * @param bool $useFlush + */ + protected function addJob(array $args, $useFlush) + { + $job = new Job(self::JOB_NAME, $args); + + if (true === $useFlush) { $this->em->persist($job); $this->em->flush(); - } else { - $uow = $this->em->getUnitOfWork(); - $uow->persist($job); - $jobMeta = $this->em->getMetadataFactory()->getMetadataFor('JMS\JobQueueBundle\Entity\Job'); - $uow->computeChangeSet($jobMeta, $job); + + return; } + + $uow = $this->em->getUnitOfWork(); + $uow->persist($job); + $jobMeta = $this->em->getMetadataFactory()->getMetadataFor('JMS\JobQueueBundle\Entity\Job'); + $uow->computeChangeSet($jobMeta, $job); + + return; } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php index 334148ad51e..a52d596dfd7 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php @@ -87,15 +87,72 @@ public function testSchedule() $that = $this; + $query = $this->getMockBuilder('\Doctrine\ORM\AbstractQuery') + ->setMethods(['setParameter', 'getResult', 'execute']) + ->disableOriginalConstructor() + ->getMockForAbstractClass(); + + $expr = $this->getMock('Doctrine\ORM\Query\Expr', ['in']); + $expr + ->expects($this->once()) + ->method('in'); + + $queryBuilder = $this->getMock( + 'Doctrine\ORM\QueryBilder', + ['select', 'from', 'andWhere', 'setParameter', 'setMaxResults', 'expr', 'getQuery'] + ); + $queryBuilder + ->expects($this->once()) + ->method('expr') + ->will($this->returnValue($expr)); + $queryBuilder + ->expects($this->once()) + ->method('select'); + $queryBuilder + ->expects($this->once()) + ->method('from'); + $queryBuilder + ->expects($this->exactly(3)) + ->method('andWhere'); + $queryBuilder + ->expects($this->exactly(2)) + ->method('setParameter'); + $queryBuilder + ->expects($this->once()) + ->method('setMaxResults'); + $queryBuilder + ->expects($this->once()) + ->method('getQuery') + ->will($this->returnValue($query)); + + $this->em + ->expects($this->any()) + ->method('createQueryBuilder') + ->will($this->returnValue($queryBuilder)); + $uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork') ->disableOriginalConstructor()->getMock(); - $this->em->expects($this->once())->method('getUnitOfWork')->will($this->returnValue($uow)); + + $this->em + ->expects($this->once()) + ->method('getUnitOfWork') + ->will($this->returnValue($uow)); + $metadataFactory = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadataFactory') ->disableOriginalConstructor()->getMock(); - $metadataFactory->expects($this->once())->method('getMetadataFor') + + $metadataFactory + ->expects($this->once()) + ->method('getMetadataFor') ->will($this->returnValue(new ClassMetadata('testEntity'))); - $this->em->expects($this->once())->method('getMetadataFactory')->will($this->returnValue($metadataFactory)); - $uow->expects($this->once())->method('persist') + + $this->em + ->expects($this->once()) + ->method('getMetadataFactory') + ->will($this->returnValue($metadataFactory)); + + $uow->expects($this->once()) + ->method('persist') ->with($this->isInstanceOf('JMS\JobQueueBundle\Entity\Job')) ->will( $this->returnCallback( From bf3dadacbfdb0ddcdf45c61d5368ac67e44f786a Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Fri, 21 Nov 2014 17:17:22 +0200 Subject: [PATCH 13/27] CRM-2157 Duplicated jobs on two way Magento sync minor fix --- src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php index b218c59f6cb..8762cf18e7c 100644 --- a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php +++ b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php @@ -71,8 +71,6 @@ protected function execute(InputInterface $input, OutputInterface $output) ->getConfiguration() ->setSQLLogger(null); - $logger->notice('inter='.$integrationId . '; conn=' . $connectorType . '; param=' . $params); - if ($this->isJobRunning($integrationId, $connectorType, $params)) { $logger->warning('Job already running. Terminating....'); From 0f8d4dc8831db79f3281be696d88e26c987b3797 Mon Sep 17 00:00:00 2001 From: Alexandr Smaga Date: Mon, 24 Nov 2014 17:33:25 +0200 Subject: [PATCH 14/27] CRM-2157: Duplicated jobs on two way Magento sync - refactor method name in integration entity - fix usage of deprecated method - fix code style issue in sheduler - create functional test for scheduler instead of unit test Conflicts: UPGRADE-1.5.md --- .../Controller/IntegrationController.php | 2 +- .../IntegrationBundle/Entity/Channel.php | 10 ++ .../Form/Type/IntegrationSelectType.php | 2 +- .../Manager/SyncScheduler.php | 73 +++++------ .../Provider/ReverseSyncProcessor.php | 2 +- .../Provider/SyncProcessor.php | 2 +- .../Resources/config/services.yml | 4 +- .../Functional/Manager/SyncSchedulerTest.php | 82 ++++++++++++ .../Tests/Unit/Manager/SyncSchedulerTest.php | 119 ++---------------- .../Provider/ReverseSyncProcessorTest.php | 2 +- .../Tests/Unit/Provider/SyncProcessorTest.php | 2 +- 11 files changed, 138 insertions(+), 162 deletions(-) create mode 100644 src/Oro/Bundle/IntegrationBundle/Tests/Functional/Manager/SyncSchedulerTest.php diff --git a/src/Oro/Bundle/IntegrationBundle/Controller/IntegrationController.php b/src/Oro/Bundle/IntegrationBundle/Controller/IntegrationController.php index 5b6532c7d08..375a5a6287a 100644 --- a/src/Oro/Bundle/IntegrationBundle/Controller/IntegrationController.php +++ b/src/Oro/Bundle/IntegrationBundle/Controller/IntegrationController.php @@ -129,7 +129,7 @@ public function scheduleAction(Integration $integration) */ public function toggleAction(Integration $integration) { - if ($integration->getEnabled()) { + if ($integration->isEnabled()) { $integration->setEnabled(false); $this->get('session')->getFlashBag()->add( 'success', diff --git a/src/Oro/Bundle/IntegrationBundle/Entity/Channel.php b/src/Oro/Bundle/IntegrationBundle/Entity/Channel.php index 9a7972c59c5..efcbef8a2ce 100644 --- a/src/Oro/Bundle/IntegrationBundle/Entity/Channel.php +++ b/src/Oro/Bundle/IntegrationBundle/Entity/Channel.php @@ -397,9 +397,19 @@ public function setEnabled($enabled) } /** + * + * @deprecated in favor of isEnabled since 1.4.1 will be removed in 1.6 * @return boolean */ public function getEnabled() + { + return $this->isEnabled(); + } + + /** + * @return bool + */ + public function isEnabled() { return $this->enabled; } diff --git a/src/Oro/Bundle/IntegrationBundle/Form/Type/IntegrationSelectType.php b/src/Oro/Bundle/IntegrationBundle/Form/Type/IntegrationSelectType.php index d63a6867e6a..55ee364ecec 100644 --- a/src/Oro/Bundle/IntegrationBundle/Form/Type/IntegrationSelectType.php +++ b/src/Oro/Bundle/IntegrationBundle/Form/Type/IntegrationSelectType.php @@ -95,7 +95,7 @@ public function finishView(FormView $view, FormInterface $form, array $options) foreach ($view->vars['choices'] as $choiceView) { /** @var Integration $integration */ $integration = $choiceView->data; - $attributes = ['data-status' => $integration->getEnabled()]; + $attributes = ['data-status' => $integration->isEnabled()]; if (isset($typeData[$integration->getType()], $typeData[$integration->getType()]['icon'])) { $attributes['data-icon'] = $this->assetHelper->getUrl($typeData[$integration->getType()]['icon']); } diff --git a/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php b/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php index 910dd9e225e..0a88a56f04f 100644 --- a/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php +++ b/src/Oro/Bundle/IntegrationBundle/Manager/SyncScheduler.php @@ -2,8 +2,9 @@ namespace Oro\Bundle\IntegrationBundle\Manager; -use Doctrine\ORM\EntityManager; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\EntityManager; +use Doctrine\Common\Persistence\ManagerRegistry; use JMS\JobQueueBundle\Entity\Job; @@ -12,29 +13,25 @@ use Oro\Bundle\IntegrationBundle\Provider\TwoWaySyncConnectorInterface; /** - * Class SyncScheduler - * - * @package Oro\Bundle\IntegrationBundle\Manager - * * This class is responsible for job scheduling needed for two way data sync. */ class SyncScheduler { const JOB_NAME = 'oro:integration:reverse:sync'; - /** @var EntityManager */ - protected $em; + /** @var ManagerRegistry */ + protected $registry; /** @var TypesRegistry */ protected $typesRegistry; /** - * @param EntityManager $em - * @param TypesRegistry $typesRegistry + * @param ManagerRegistry $registry + * @param TypesRegistry $typesRegistry */ - public function __construct(EntityManager $em, TypesRegistry $typesRegistry) + public function __construct(ManagerRegistry $registry, TypesRegistry $typesRegistry) { - $this->em = $em; + $this->registry = $registry; $this->typesRegistry = $typesRegistry; } @@ -50,7 +47,7 @@ public function __construct(EntityManager $em, TypesRegistry $typesRegistry) */ public function schedule(Integration $integration, $connectorType, $params = [], $useFlush = true) { - if (!$integration->getEnabled()) { + if (!$integration->isEnabled()) { return; } @@ -65,53 +62,39 @@ public function schedule(Integration $integration, $connectorType, $params = [], '--params=' . serialize($params) ]; - if ($this->hasNoSameJobs($args)) { - $this->addJob($args, $useFlush); + if (!$this->isScheduled($args)) { + $job = new Job(self::JOB_NAME, $args); + + /** @var EntityManager $em */ + $em = $this->registry->getManagerForClass('JMSJobQueueBundle:Job'); + $em->persist($job); + + if (true === $useFlush) { + $em->flush(); + } else { + $jobMeta = $em->getClassMetadata('JMSJobQueueBundle:Job'); + $em->getUnitOfWork()->computeChangeSet($jobMeta, $job); + } } } /** + * Check whether job for export is already scheduled and waiting to be processed + * * @param array $args * * @return bool */ - protected function hasNoSameJobs(array $args) + protected function isScheduled(array $args) { - $qb = $this->em->createQueryBuilder(); - - $qb->select('j'); - $qb->from('JMSJobQueueBundle:Job', 'j'); + $qb = $this->registry->getRepository('JMSJobQueueBundle:Job')->createQueryBuilder('j'); + $qb->select('count(j.id)'); $qb->andWhere('j.command = :command'); $qb->andWhere('j.args = :args'); $qb->andWhere($qb->expr()->in('j.state', [Job::STATE_PENDING, Job::STATE_NEW])); $qb->setParameter('command', self::JOB_NAME); $qb->setParameter('args', $args, Type::JSON_ARRAY); - $qb->setMaxResults(1); - $result = $qb->getQuery()->getArrayResult(); - - return empty($result); - } - - /** - * @param array $args - * @param bool $useFlush - */ - protected function addJob(array $args, $useFlush) - { - $job = new Job(self::JOB_NAME, $args); - - if (true === $useFlush) { - $this->em->persist($job); - $this->em->flush(); - - return; - } - - $uow = $this->em->getUnitOfWork(); - $uow->persist($job); - $jobMeta = $this->em->getMetadataFactory()->getMetadataFor('JMS\JobQueueBundle\Entity\Job'); - $uow->computeChangeSet($jobMeta, $job); - return; + return $qb->getQuery()->getSingleScalarResult(); } } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php index a77e66250c4..42f5d5d9307 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php @@ -52,7 +52,7 @@ public function __construct( */ public function process(Integration $integration, $connector, array $parameters) { - if (!$integration->getEnabled()) { + if (!$integration->isEnabled()) { return $this; } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 18363503292..3c1e0202a2b 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -138,7 +138,7 @@ protected function processIntegrationConnector( array $parameters = [], $saveStatus = true ) { - if (!$integration->getEnabled()) { + if (!$integration->isEnabled()) { return false; } diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml index 7d4f04bbc42..4e035e398de 100644 --- a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml @@ -175,7 +175,9 @@ services: oro_integration.sync_scheduler: class: %oro_integration.sync_scheduler.class% - arguments: [ @doctrine.orm.entity_manager, @oro_integration.manager.types_registry ] + arguments: + - @doctrine + - @oro_integration.manager.types_registry oro_integration.reverse_sync.processor: class: %oro_integration.reverse_sync.processor.class% diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Manager/SyncSchedulerTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Manager/SyncSchedulerTest.php new file mode 100644 index 00000000000..ce863120186 --- /dev/null +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Functional/Manager/SyncSchedulerTest.php @@ -0,0 +1,82 @@ +initClient([], $this->generateBasicAuthHeader()); + $this->client->startTransaction(); + } + + protected function tearDown() + { + $this->client->rollbackTransaction(); + parent::tearDown(); + } + + public function testScheduleWithoutFlush() + { + $this->assertEmpty($this->getScheduledJobs(), 'Should be empty before test'); + + $registry = $this->getContainer()->get('oro_integration.manager.types_registry'); + + $integrationType = uniqid('testIntegrationType', true); + $connectorType = uniqid('testConnectorType', true); + + $registry->addChannelType($integrationType, new TestIntegrationType()); + $registry->addConnectorType($connectorType, $integrationType, new TestTwoWayConnector()); + + $integration = new Integration(); + $integration->setType($integrationType); + + $this->getContainer()->get('oro_integration.sync_scheduler')->schedule($integration, $connectorType, [], false); + $this->assertEmpty($this->getScheduledJobs(), 'Should be empty before flush'); + + $this->getContainer()->get('doctrine')->getManager()->flush(); + + $jobs = $this->getScheduledJobs(); + $this->assertNotEmpty($jobs); + } + + public function testWithFlush() + { + $this->assertEmpty($this->getScheduledJobs(), 'Should be empty before test'); + + $registry = $this->getContainer()->get('oro_integration.manager.types_registry'); + + $integrationType = uniqid('testIntegrationType', true); + $connectorType = uniqid('testConnectorType', true); + + $registry->addChannelType($integrationType, new TestIntegrationType()); + $registry->addConnectorType($connectorType, $integrationType, new TestTwoWayConnector()); + + $integration = new Integration(); + $integration->setType($integrationType); + + $this->getContainer()->get('oro_integration.sync_scheduler')->schedule($integration, $connectorType); + + $jobs = $this->getScheduledJobs(); + $this->assertNotEmpty($jobs); + + $this->getContainer()->get('oro_integration.sync_scheduler')->schedule($integration, $connectorType); + $jobs = $this->getScheduledJobs(); + $this->assertCount(1, $jobs, 'Should check do look up for already scheduled pending jobs'); + } + + /** + * @return array|\JMS\JobQueueBundle\Entity\Job[] + */ + protected function getScheduledJobs() + { + return $this->getContainer()->get('doctrine')->getRepository('JMSJobQueueBundle:Job') + ->findBy(['command' => 'oro:integration:reverse:sync']); + } +} diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php index a52d596dfd7..f32c844c201 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Manager/SyncSchedulerTest.php @@ -3,22 +3,22 @@ namespace Oro\Bundle\IntegrationBundle\Tests\Unit\Manager; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\Mapping\ClassMetadata; - -use JMS\JobQueueBundle\Entity\Job; +use Doctrine\Common\Persistence\ManagerRegistry; use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration; use Oro\Bundle\IntegrationBundle\Manager\SyncScheduler; use Oro\Bundle\IntegrationBundle\Manager\TypesRegistry; use Oro\Bundle\IntegrationBundle\Tests\Unit\Fixture\TestIntegrationType; use Oro\Bundle\IntegrationBundle\Tests\Unit\Fixture\TestConnector; -use Oro\Bundle\IntegrationBundle\Tests\Unit\Fixture\TestTwoWayConnector; class SyncSchedulerTest extends \PHPUnit_Framework_TestCase { /** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */ protected $em; + /** @var ManagerRegistry|\PHPUnit_Framework_MockObject_MockObject */ + protected $registry; + /** @var TypesRegistry */ protected $typesRegistry; @@ -27,15 +27,17 @@ class SyncSchedulerTest extends \PHPUnit_Framework_TestCase public function setUp() { - $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager') + $this->em = $this->getMockBuilder('Doctrine\ORM\EntityManager') ->disableOriginalConstructor()->getMock(); + $this->registry = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry'); + $this->typesRegistry = new TypesRegistry(); - $this->scheduler = new SyncScheduler($this->em, $this->typesRegistry); + $this->scheduler = new SyncScheduler($this->registry, $this->typesRegistry); } public function tearDown() { - unset($this->em, $this->typesRegistry, $this->scheduler); + unset($this->em, $this->registry, $this->typesRegistry, $this->scheduler); } /** @@ -68,107 +70,4 @@ public function testScheduleConnectorError() $this->scheduler->schedule($integration, $testConnectorType); } - - public function testSchedule() - { - $testIntegrationType = 'testIntegrationType'; - $testConnectorType = 'testConnectorType'; - $testId = 22; - - $integration = new Integration(); - $integration->setType($testIntegrationType); - $integration->setEnabled(true); - $ref = new \ReflectionProperty(get_class($integration), 'id'); - - $ref->setAccessible(true); - $ref->setValue($integration, $testId); - $this->typesRegistry->addChannelType($testIntegrationType, new TestIntegrationType()); - $this->typesRegistry->addConnectorType($testConnectorType, $testIntegrationType, new TestTwoWayConnector()); - - $that = $this; - - $query = $this->getMockBuilder('\Doctrine\ORM\AbstractQuery') - ->setMethods(['setParameter', 'getResult', 'execute']) - ->disableOriginalConstructor() - ->getMockForAbstractClass(); - - $expr = $this->getMock('Doctrine\ORM\Query\Expr', ['in']); - $expr - ->expects($this->once()) - ->method('in'); - - $queryBuilder = $this->getMock( - 'Doctrine\ORM\QueryBilder', - ['select', 'from', 'andWhere', 'setParameter', 'setMaxResults', 'expr', 'getQuery'] - ); - $queryBuilder - ->expects($this->once()) - ->method('expr') - ->will($this->returnValue($expr)); - $queryBuilder - ->expects($this->once()) - ->method('select'); - $queryBuilder - ->expects($this->once()) - ->method('from'); - $queryBuilder - ->expects($this->exactly(3)) - ->method('andWhere'); - $queryBuilder - ->expects($this->exactly(2)) - ->method('setParameter'); - $queryBuilder - ->expects($this->once()) - ->method('setMaxResults'); - $queryBuilder - ->expects($this->once()) - ->method('getQuery') - ->will($this->returnValue($query)); - - $this->em - ->expects($this->any()) - ->method('createQueryBuilder') - ->will($this->returnValue($queryBuilder)); - - $uow = $this->getMockBuilder('Doctrine\ORM\UnitOfWork') - ->disableOriginalConstructor()->getMock(); - - $this->em - ->expects($this->once()) - ->method('getUnitOfWork') - ->will($this->returnValue($uow)); - - $metadataFactory = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadataFactory') - ->disableOriginalConstructor()->getMock(); - - $metadataFactory - ->expects($this->once()) - ->method('getMetadataFor') - ->will($this->returnValue(new ClassMetadata('testEntity'))); - - $this->em - ->expects($this->once()) - ->method('getMetadataFactory') - ->will($this->returnValue($metadataFactory)); - - $uow->expects($this->once()) - ->method('persist') - ->with($this->isInstanceOf('JMS\JobQueueBundle\Entity\Job')) - ->will( - $this->returnCallback( - function (Job $job) use ($that, $testId, $testConnectorType) { - $expectedArgs = [ - '--integration=' . $testId, - sprintf('--connector=testConnectorType', $testConnectorType), - '--params=a:0:{}', - ]; - - $that->assertEquals($expectedArgs, $job->getArgs()); - } - ) - ); - $uow->expects($this->once())->method('computeChangeSet'); - - $this->scheduler->schedule($integration, $testConnectorType, [], false); - } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php index a7daa3ce9ca..c222841e10c 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php @@ -95,7 +95,7 @@ public function testOneIntegrationConnectorProcess() ->will($this->returnValue($realConnector)); $this->integration->expects($this->once()) - ->method('getEnabled') + ->method('isEnabled') ->will($this->returnValue(true)); $jobResult = new JobResult(); diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php index 58affd81eac..25f132c0263 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php @@ -128,7 +128,7 @@ public function testOneChannelConnectorProcess() $this->integration ->expects($this->once()) - ->method('getEnabled') + ->method('isEnabled') ->will($this->returnValue(true)); $realConnector = new TestConnector(); From 2741242c7810ad1d2e7a797a366941a3ffd3f5a5 Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Tue, 25 Nov 2014 19:40:00 +0200 Subject: [PATCH 15/27] EL-102: Magento integration with for EnvironmentalLights.com is working with errors - changed acceptal address postal code length to 255 in db and validation rules --- .../AddressBundle/Entity/AbstractAddress.php | 2 +- .../Schema/OroAddressBundleInstaller.php | 192 +++++++++++++++++- .../v1_2/ChangeAddressPostalCodeLength.php | 20 ++ .../Resources/config/validation.yml | 2 +- 4 files changed, 203 insertions(+), 13 deletions(-) create mode 100644 src/Oro/Bundle/AddressBundle/Migrations/Schema/v1_2/ChangeAddressPostalCodeLength.php diff --git a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php index 762be62647c..3259011e573 100644 --- a/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php +++ b/src/Oro/Bundle/AddressBundle/Entity/AbstractAddress.php @@ -107,7 +107,7 @@ abstract class AbstractAddress implements EmptyItem, FullNameInterface, AddressI /** * @var string * - * @ORM\Column(name="postal_code", type="string", length=20, nullable=true) + * @ORM\Column(name="postal_code", type="string", length=255, nullable=true) * @Soap\ComplexType("string", nillable=true) * @ConfigField( * defaultValues={ diff --git a/src/Oro/Bundle/AddressBundle/Migrations/Schema/OroAddressBundleInstaller.php b/src/Oro/Bundle/AddressBundle/Migrations/Schema/OroAddressBundleInstaller.php index b842006c8c7..785e8cdc7b5 100644 --- a/src/Oro/Bundle/AddressBundle/Migrations/Schema/OroAddressBundleInstaller.php +++ b/src/Oro/Bundle/AddressBundle/Migrations/Schema/OroAddressBundleInstaller.php @@ -5,7 +5,6 @@ use Doctrine\DBAL\Schema\Schema; use Oro\Bundle\MigrationBundle\Migration\Installation; use Oro\Bundle\MigrationBundle\Migration\QueryBag; -use Oro\Bundle\AddressBundle\Migrations\Schema\v1_0\OroAddressBundle; class OroAddressBundleInstaller implements Installation { @@ -14,22 +13,193 @@ class OroAddressBundleInstaller implements Installation */ public function getMigrationVersion() { - return 'v1_1'; + return 'v1_2'; } /** - * @inheritdoc + * {@inheritdoc} */ public function up(Schema $schema, QueryBag $queries) { - OroAddressBundle::oroAddressTable($schema); - OroAddressBundle::oroAddressTypeTable($schema); - OroAddressBundle::oroAddressTypeTranslationTable($schema); - OroAddressBundle::oroDictionaryCountryTable($schema); - OroAddressBundle::oroDictionaryCountryTranslationTable($schema, 'oro_dictionary_country_trans'); - OroAddressBundle::oroDictionaryRegion($schema); - OroAddressBundle::oroDictionaryRegionTranslationTable($schema, 'oro_dictionary_region_trans'); + /** Tables generation **/ + $this->createOroAddressTable($schema); + $this->createOroAddressTypeTable($schema); + $this->createOroAddressTypeTranslationTable($schema); + $this->createOroDictionaryCountryTable($schema); + $this->createOroDictionaryCountryTransTable($schema); + $this->createOroDictionaryRegionTable($schema); + $this->createOroDictionaryRegionTransTable($schema); + + /** Foreign keys generation **/ + $this->addOroAddressForeignKeys($schema); + $this->addOroDictionaryRegionForeignKeys($schema); + } + + /** + * Create oro_address table + * + * @param Schema $schema + */ + protected function createOroAddressTable(Schema $schema) + { + $table = $schema->createTable('oro_address'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('country_code', 'string', ['notnull' => false, 'length' => 2]); + $table->addColumn('region_code', 'string', ['notnull' => false, 'length' => 16]); + $table->addColumn('label', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('street', 'string', ['notnull' => false, 'length' => 500]); + $table->addColumn('street2', 'string', ['notnull' => false, 'length' => 500]); + $table->addColumn('city', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('postal_code', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('organization', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('region_text', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('name_prefix', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('first_name', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('middle_name', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('last_name', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('name_suffix', 'string', ['notnull' => false, 'length' => 255]); + $table->addColumn('created', 'datetime', []); + $table->addColumn('updated', 'datetime', []); + $table->setPrimaryKey(['id']); + $table->addIndex(['country_code'], 'IDX_C5E99957F026BB7C', []); + $table->addIndex(['region_code'], 'IDX_C5E99957AEB327AF', []); + } + + /** + * Create oro_address_type table + * + * @param Schema $schema + */ + protected function createOroAddressTypeTable(Schema $schema) + { + $table = $schema->createTable('oro_address_type'); + $table->addColumn('name', 'string', ['length' => 16]); + $table->addColumn('label', 'string', ['length' => 255]); + $table->setPrimaryKey(['name']); + $table->addUniqueIndex(['label'], 'UNIQ_8B3E52E3EA750E8'); + } + + /** + * Create oro_address_type_translation table + * + * @param Schema $schema + */ + protected function createOroAddressTypeTranslationTable(Schema $schema) + { + $table = $schema->createTable('oro_address_type_translation'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('foreign_key', 'string', ['length' => 16]); + $table->addColumn('content', 'string', ['length' => 255]); + $table->addColumn('locale', 'string', ['length' => 8]); + $table->addColumn('object_class', 'string', ['length' => 255]); + $table->addColumn('field', 'string', ['length' => 32]); + $table->setPrimaryKey(['id']); + $table->addIndex(['locale', 'object_class', 'field', 'foreign_key'], 'address_type_translation_idx', []); + } + + /** + * Create oro_dictionary_country table + * + * @param Schema $schema + */ + protected function createOroDictionaryCountryTable(Schema $schema) + { + $table = $schema->createTable('oro_dictionary_country'); + $table->addColumn('iso2_code', 'string', ['length' => 2]); + $table->addColumn('iso3_code', 'string', ['length' => 3]); + $table->addColumn('name', 'string', ['length' => 255]); + $table->setPrimaryKey(['iso2_code']); + $table->addIndex(['name'], 'country_name_idx', []); + } + + /** + * Create oro_dictionary_country_trans table + * + * @param Schema $schema + */ + protected function createOroDictionaryCountryTransTable(Schema $schema) + { + $table = $schema->createTable('oro_dictionary_country_trans'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('foreign_key', 'string', ['length' => 2]); + $table->addColumn('content', 'string', ['length' => 255]); + $table->addColumn('locale', 'string', ['length' => 8]); + $table->addColumn('object_class', 'string', ['length' => 255]); + $table->addColumn('field', 'string', ['length' => 32]); + $table->setPrimaryKey(['id']); + $table->addIndex(['locale', 'object_class', 'field', 'foreign_key'], 'country_translation_idx', []); + } + + /** + * Create oro_dictionary_region table + * + * @param Schema $schema + */ + protected function createOroDictionaryRegionTable(Schema $schema) + { + $table = $schema->createTable('oro_dictionary_region'); + $table->addColumn('combined_code', 'string', ['length' => 16]); + $table->addColumn('country_code', 'string', ['notnull' => false, 'length' => 2]); + $table->addColumn('code', 'string', ['length' => 32]); + $table->addColumn('name', 'string', ['length' => 255]); + $table->setPrimaryKey(['combined_code']); + $table->addIndex(['country_code'], 'IDX_8C71325AF026BB7C', []); + $table->addIndex(['name'], 'region_name_idx', []); + } - OroAddressBundle::addForeignKeys($schema); + /** + * Create oro_dictionary_region_trans table + * + * @param Schema $schema + */ + protected function createOroDictionaryRegionTransTable(Schema $schema) + { + $table = $schema->createTable('oro_dictionary_region_trans'); + $table->addColumn('id', 'integer', ['autoincrement' => true]); + $table->addColumn('foreign_key', 'string', ['length' => 16]); + $table->addColumn('content', 'string', ['length' => 255]); + $table->addColumn('locale', 'string', ['length' => 8]); + $table->addColumn('object_class', 'string', ['length' => 255]); + $table->addColumn('field', 'string', ['length' => 32]); + $table->setPrimaryKey(['id']); + $table->addIndex(['locale', 'object_class', 'field', 'foreign_key'], 'region_translation_idx', []); + } + + /** + * Add oro_address foreign keys. + * + * @param Schema $schema + */ + protected function addOroAddressForeignKeys(Schema $schema) + { + $table = $schema->getTable('oro_address'); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_country'), + ['country_code'], + ['iso2_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_region'), + ['region_code'], + ['combined_code'], + ['onDelete' => null, 'onUpdate' => null] + ); + } + + /** + * Add oro_dictionary_region foreign keys. + * + * @param Schema $schema + */ + protected function addOroDictionaryRegionForeignKeys(Schema $schema) + { + $table = $schema->getTable('oro_dictionary_region'); + $table->addForeignKeyConstraint( + $schema->getTable('oro_dictionary_country'), + ['country_code'], + ['iso2_code'], + ['onDelete' => null, 'onUpdate' => null] + ); } } diff --git a/src/Oro/Bundle/AddressBundle/Migrations/Schema/v1_2/ChangeAddressPostalCodeLength.php b/src/Oro/Bundle/AddressBundle/Migrations/Schema/v1_2/ChangeAddressPostalCodeLength.php new file mode 100644 index 00000000000..99e1578eaf8 --- /dev/null +++ b/src/Oro/Bundle/AddressBundle/Migrations/Schema/v1_2/ChangeAddressPostalCodeLength.php @@ -0,0 +1,20 @@ +getTable('oro_address'); + $table->changeColumn('postal_code', ['length' => 255]); + } +} diff --git a/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml b/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml index 6aeb6f7c3f1..c73577ce9c4 100644 --- a/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml +++ b/src/Oro/Bundle/AddressBundle/Resources/config/validation.yml @@ -14,7 +14,7 @@ Oro\Bundle\AddressBundle\Entity\AbstractAddress: postalCode: - Length: - max: 20 + max: 255 country: - NotBlank: ~ From bcd9e17c73374ab0878b5f881fc17827bcf909b0 Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 16:21:21 +0200 Subject: [PATCH 16/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs --- .../Provider/SyncProcessor.php | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 3c1e0202a2b..d15d021b158 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -6,6 +6,7 @@ use Oro\Bundle\ImportExportBundle\Context\ContextInterface; use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; +use Oro\Bundle\ImportExportBundle\Job\JobResult; use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration; use Oro\Bundle\IntegrationBundle\Entity\Status; use Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy; @@ -210,7 +211,7 @@ protected function processImport($connector, $jobName, $configuration, Integrati $connectorData = $context->getValue(ConnectorInterface::CONTEXT_CONNECTOR_DATA_KEY); } - $exceptions = $jobResult->getFailureExceptions(); + $exceptions = $this->getExceptions($jobResult); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); $status = new Status(); @@ -261,4 +262,21 @@ protected function processImport($connector, $jobName, $configuration, Integrati return $isSuccess; } + + /** + * @param JobResult $jobResult + * + * @return array + */ + protected function getExceptions(JobResult $jobResult) + { + $exceptions = $jobResult->getFailureExceptions(); + $result = []; + + foreach ($exceptions as $exception) { + $result[] = preg_replace("/(.*)<\/apiKey>/i", "", $exception); + } + + return $result; + } } From 8254ed5b0dc1332a4b4beeed2f954f7f26e801e2 Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 16:24:47 +0200 Subject: [PATCH 17/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs rename method --- src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index d15d021b158..25fc69e7bc9 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -211,7 +211,7 @@ protected function processImport($connector, $jobName, $configuration, Integrati $connectorData = $context->getValue(ConnectorInterface::CONTEXT_CONNECTOR_DATA_KEY); } - $exceptions = $this->getExceptions($jobResult); + $exceptions = $this->getJobResultExceptions($jobResult); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); $status = new Status(); @@ -268,7 +268,7 @@ protected function processImport($connector, $jobName, $configuration, Integrati * * @return array */ - protected function getExceptions(JobResult $jobResult) + protected function getJobResultExceptions(JobResult $jobResult) { $exceptions = $jobResult->getFailureExceptions(); $result = []; From 958a10ec51c9a1c2d9f66755e1b8ab8f3d0d6a32 Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 18:26:49 +0200 Subject: [PATCH 18/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs add getTransport() to the connector add processExceptionMessages() to the transport --- .../Provider/AbstractConnector.php | 5 +++++ .../Provider/ConnectorInterface.php | 5 +++++ .../Rest/Transport/AbstractRestTransport.php | 8 +++++++ .../Provider/SOAPTransport.php | 14 ++++++++++++ .../Provider/SyncProcessor.php | 22 ++++++++++--------- .../Provider/TransportInterface.php | 7 ++++++ .../Tests/Unit/Fixture/TestConnector.php | 8 +++++++ .../Tests/Unit/Provider/SyncProcessorTest.php | 2 +- 8 files changed, 60 insertions(+), 11 deletions(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php index 8622785bdee..650ccaa837b 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php @@ -48,6 +48,11 @@ public function __construct( $this->contextMediator = $contextMediator; } + public function getTransport() + { + return $this->transport; + } + /** * {@inheritdoc} */ diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php b/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php index 887194e01a9..fb7e506973b 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php @@ -33,4 +33,9 @@ public function getImportJobName(); * @return string */ public function getType(); + + /** + * @return TransportInterface + */ + public function getTransport(); } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php b/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php index 071722a4718..918f93b94f5 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php @@ -43,6 +43,14 @@ public function init(Transport $transportEntity) $this->client = $this->createRestClient($transportEntity); } + /** + * {@inheritdoc} + */ + public function processExceptionMessages(array $exceptions) + { + return $exceptions; + } + /** * Create REST client * diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php b/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php index 6fb864f6939..a072adcf0b8 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php @@ -128,6 +128,20 @@ public function setMultipleAttemptsEnabled($multipleAttemptsEnabled) $this->multipleAttemptsEnabled = $multipleAttemptsEnabled; } + /** + * {@inheritdoc} + */ + public function processExceptionMessages(array $exceptions) + { + $result = []; + + foreach ($exceptions as $exception) { + $result[] = preg_replace("/(.*)<\/apiKey>/i", "", $exception); + } + + return $result; + } + /** * @param string $wsdlUrl * diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 25fc69e7bc9..7c6c45a94a2 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -210,8 +210,7 @@ protected function processImport($connector, $jobName, $configuration, Integrati $counts['process'] += $counts['delete'] = $context->getDeleteCount(); $connectorData = $context->getValue(ConnectorInterface::CONTEXT_CONNECTOR_DATA_KEY); } - - $exceptions = $this->getJobResultExceptions($jobResult); + $exceptions = $this->getJobResultExceptions($jobResult, $integration, $connector); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); $status = new Status(); @@ -264,19 +263,22 @@ protected function processImport($connector, $jobName, $configuration, Integrati } /** - * @param JobResult $jobResult + * @param JobResult $jobResult + * @param Integration $integration + * @param string $connector * * @return array */ - protected function getJobResultExceptions(JobResult $jobResult) + protected function getJobResultExceptions(JobResult $jobResult, Integration $integration, $connector) { - $exceptions = $jobResult->getFailureExceptions(); - $result = []; + /** @var array $exceptions */ + $exceptions = $jobResult->getFailureExceptions(); + /** @var ConnectorInterface $connectorType */ + $connectorType = $this->registry->getConnectorType($integration->getType(), $connector); + /** @var TransportInterface $transport */ + $transport = $connectorType->getTransport(); - foreach ($exceptions as $exception) { - $result[] = preg_replace("/(.*)<\/apiKey>/i", "", $exception); - } - return $result; + return $transport->processExceptionMessages($exceptions); } } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php b/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php index 3f1a4d486b8..9787631c021 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php @@ -31,4 +31,11 @@ public function getSettingsFormType(); * @return string */ public function getSettingsEntityFQCN(); + + /** + * @param array $messages + * + * @return array + */ + public function processExceptionMessages(array $messages); } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php index 0dbb37a036e..a96867dff3c 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php @@ -37,4 +37,12 @@ public function getType() { return 'test Type'; } + + /** + * {@inheritdoc} + */ + public function getTransport() + { + return 'test Type'; + } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php index 25f132c0263..63d5d922117 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php @@ -133,7 +133,7 @@ public function testOneChannelConnectorProcess() $realConnector = new TestConnector(); $this->registry - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('getConnectorType') ->will($this->returnValue($realConnector)); From f1be59b35ca6c9bf9e703115370366287c7aeea2 Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 18:27:59 +0200 Subject: [PATCH 19/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs minor fix --- .../Bundle/IntegrationBundle/Provider/AbstractConnector.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php index 650ccaa837b..4e91dcc2a15 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php @@ -48,6 +48,9 @@ public function __construct( $this->contextMediator = $contextMediator; } + /** + * {@inheritdoc} + */ public function getTransport() { return $this->transport; From 806d9f9ff422ee50db84482a3e740adc6a55086d Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 19:05:57 +0200 Subject: [PATCH 20/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs fix unittests --- .../Provider/SyncProcessor.php | 1 - .../Tests/Unit/Fixture/TestConnector.php | 2 +- .../Tests/Unit/Fixture/TestTransport.php | 49 +++++++++++++++++++ .../Tests/Unit/Provider/SoapTransportTest.php | 15 ++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 7c6c45a94a2..61fe4707744 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -278,7 +278,6 @@ protected function getJobResultExceptions(JobResult $jobResult, Integration $int /** @var TransportInterface $transport */ $transport = $connectorType->getTransport(); - return $transport->processExceptionMessages($exceptions); } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php index a96867dff3c..bc23b4453d3 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php @@ -43,6 +43,6 @@ public function getType() */ public function getTransport() { - return 'test Type'; + return new TestTransport(); } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php new file mode 100644 index 00000000000..828027fd9de --- /dev/null +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php @@ -0,0 +1,49 @@ +transport->init($this->transportEntity); $this->transport->call('test'); } + + public function testProcessExceptionMessages() + { + $message = '' . + 'abc' . + 'abcabc1'; + + $validMessage = '' . + 'abc' . + ''; + + $result = $this->transport->processExceptionMessages([$message]); + + $this->assertEquals([$validMessage], $result); + } } From 5e9c1e11d86c5e1fffc269c43e80ae2773044d20 Mon Sep 17 00:00:00 2001 From: Dmitry Naydenov Date: Mon, 24 Nov 2014 20:48:44 +0200 Subject: [PATCH 21/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs Conflicts: src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php --- .../ImportExportBundle/Job/JobResult.php | 12 +++++ .../Event/AfterJobExecutionEvent.php | 31 +++++++++++++ .../Provider/SyncProcessor.php | 44 ++++++++----------- .../Resources/config/services.yml | 1 + 4 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php diff --git a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php index 78b35c78e8b..dc93db2f00a 100644 --- a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php +++ b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php @@ -75,6 +75,18 @@ public function addFailureException($failureException) return $this; } + /** + * @param string $failureException + */ + public function removeFailureException($failureException) + { + $key = array_search($failureException, $this->failureExceptions, true); + + if (false !== $key) { + unset($this->failureExceptions[$key]); + } + } + /** * @param ContextInterface $context * @return JobResult diff --git a/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php b/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php new file mode 100644 index 00000000000..f9d45b19990 --- /dev/null +++ b/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php @@ -0,0 +1,31 @@ +jobResult = $jobResult; + } + + /** + * @return JobResult + */ + public function getJobResult() + { + return $this->jobResult; + } +} diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 61fe4707744..7affac8da81 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -2,6 +2,7 @@ namespace Oro\Bundle\IntegrationBundle\Provider; +use Oro\Bundle\IntegrationBundle\Event\AfterJobExecutionEvent; use Symfony\Bridge\Doctrine\RegistryInterface; use Oro\Bundle\ImportExportBundle\Context\ContextInterface; @@ -12,6 +13,7 @@ use Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy; use Oro\Bundle\IntegrationBundle\Manager\TypesRegistry; use Oro\Bundle\IntegrationBundle\ImportExport\Job\Executor; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; class SyncProcessor { @@ -30,25 +32,31 @@ class SyncProcessor /** @var LoggerStrategy */ protected $logger; + /** @var EventDispatcherInterface */ + protected $eventDispatcher; + /** - * @param RegistryInterface $doctrineRegistry - * @param ProcessorRegistry $processorRegistry - * @param Executor $jobExecutor - * @param TypesRegistry $registry - * @param LoggerStrategy $logger + * @param RegistryInterface $doctrineRegistry + * @param ProcessorRegistry $processorRegistry + * @param Executor $jobExecutor + * @param TypesRegistry $registry + * @param LoggerStrategy $logger + * @param EventDispatcherInterface $eventDispatcher */ public function __construct( RegistryInterface $doctrineRegistry, ProcessorRegistry $processorRegistry, Executor $jobExecutor, TypesRegistry $registry, - LoggerStrategy $logger + LoggerStrategy $logger, + EventDispatcherInterface $eventDispatcher ) { $this->doctrineRegistry = $doctrineRegistry; $this->processorRegistry = $processorRegistry; $this->jobExecutor = $jobExecutor; $this->registry = $registry; $this->logger = $logger; + $this->eventDispatcher = $eventDispatcher; } /** @@ -210,7 +218,10 @@ protected function processImport($connector, $jobName, $configuration, Integrati $counts['process'] += $counts['delete'] = $context->getDeleteCount(); $connectorData = $context->getValue(ConnectorInterface::CONTEXT_CONNECTOR_DATA_KEY); } - $exceptions = $this->getJobResultExceptions($jobResult, $integration, $connector); + + $this->eventDispatcher->dispatch(AfterJobExecutionEvent::NAME, new AfterJobExecutionEvent($jobResult)); + + $exceptions = $jobResult->getFailureExceptions(); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); $status = new Status(); @@ -261,23 +272,4 @@ protected function processImport($connector, $jobName, $configuration, Integrati return $isSuccess; } - - /** - * @param JobResult $jobResult - * @param Integration $integration - * @param string $connector - * - * @return array - */ - protected function getJobResultExceptions(JobResult $jobResult, Integration $integration, $connector) - { - /** @var array $exceptions */ - $exceptions = $jobResult->getFailureExceptions(); - /** @var ConnectorInterface $connectorType */ - $connectorType = $this->registry->getConnectorType($integration->getType(), $connector); - /** @var TransportInterface $transport */ - $transport = $connectorType->getTransport(); - - return $transport->processExceptionMessages($exceptions); - } } diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml index 4e035e398de..6bc7dfbb0b5 100644 --- a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml @@ -158,6 +158,7 @@ services: - @oro_integration.job_executor - @oro_integration.manager.types_registry - @oro_integration.logger.strategy + - @event_dispatcher lazy: true oro_integration.provider.connector_context_mediator: From b14a9a81eab43a39d62a07ab5b85122740eac3bc Mon Sep 17 00:00:00 2001 From: Alexandr Smaga Date: Tue, 25 Nov 2014 13:48:44 +0200 Subject: [PATCH 22/27] CRM-2152: Magento Integration: Sensitive data displayed in API request logs - fix code style - refactor sync processors - fix unit tests - removed not used code Conflicts: src/Oro/Bundle/ImportExportBundle/Job/JobResult.php src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php --- .../ImportExportBundle/Job/JobResult.php | 13 +- .../Event/AfterJobExecutionEvent.php | 31 ----- .../Event/DefaultOwnerSetEvent.php | 2 +- .../Event/IntegrationUpdateEvent.php | 2 +- .../IntegrationBundle/Event/SyncEvent.php | 70 +++++++++++ .../Provider/AbstractConnector.php | 8 -- .../Provider/AbstractSyncProcessor.php | 110 +++++++++++++++++ .../Provider/ConnectorInterface.php | 5 - .../Rest/Transport/AbstractRestTransport.php | 8 -- .../Provider/ReverseSyncProcessor.php | 116 +++++------------- .../Provider/SOAPTransport.php | 14 --- .../Provider/SyncProcessor.php | 106 +++++----------- .../Provider/TransportInterface.php | 7 -- .../Provider/TwoWaySyncConnectorInterface.php | 2 +- .../Resources/config/services.yml | 3 +- .../Tests/Unit/Fixture/TestConnector.php | 8 -- .../Tests/Unit/Fixture/TestTransport.php | 8 -- .../Provider/ReverseSyncProcessorTest.php | 37 +++--- .../Tests/Unit/Provider/SoapTransportTest.php | 15 --- .../Tests/Unit/Provider/SyncProcessorTest.php | 26 ++-- 20 files changed, 290 insertions(+), 301 deletions(-) delete mode 100644 src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php create mode 100644 src/Oro/Bundle/IntegrationBundle/Event/SyncEvent.php create mode 100644 src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php diff --git a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php index dc93db2f00a..5285cb64496 100644 --- a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php +++ b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php @@ -76,15 +76,14 @@ public function addFailureException($failureException) } /** - * @param string $failureException + * @param array $failureException + * + * @return $this */ - public function removeFailureException($failureException) + public function setFailureExceptions(array $failureException) { - $key = array_search($failureException, $this->failureExceptions, true); - - if (false !== $key) { - unset($this->failureExceptions[$key]); - } + $this->failureExceptions = $failureException; + return $this; } /** diff --git a/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php b/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php deleted file mode 100644 index f9d45b19990..00000000000 --- a/src/Oro/Bundle/IntegrationBundle/Event/AfterJobExecutionEvent.php +++ /dev/null @@ -1,31 +0,0 @@ -jobResult = $jobResult; - } - - /** - * @return JobResult - */ - public function getJobResult() - { - return $this->jobResult; - } -} diff --git a/src/Oro/Bundle/IntegrationBundle/Event/DefaultOwnerSetEvent.php b/src/Oro/Bundle/IntegrationBundle/Event/DefaultOwnerSetEvent.php index 45b06ef0ac8..d888e755f49 100644 --- a/src/Oro/Bundle/IntegrationBundle/Event/DefaultOwnerSetEvent.php +++ b/src/Oro/Bundle/IntegrationBundle/Event/DefaultOwnerSetEvent.php @@ -25,7 +25,7 @@ class DefaultOwnerSetEvent extends Event */ public function __construct(Integration $integration) { - $this->integration= $integration; + $this->integration = $integration; } /** diff --git a/src/Oro/Bundle/IntegrationBundle/Event/IntegrationUpdateEvent.php b/src/Oro/Bundle/IntegrationBundle/Event/IntegrationUpdateEvent.php index c149e865219..34cc00a72db 100644 --- a/src/Oro/Bundle/IntegrationBundle/Event/IntegrationUpdateEvent.php +++ b/src/Oro/Bundle/IntegrationBundle/Event/IntegrationUpdateEvent.php @@ -27,7 +27,7 @@ class IntegrationUpdateEvent extends Event public function __construct(Integration $integration, Integration $oldState) { $this->integration = $integration; - $this->oldState = $oldState; + $this->oldState = $oldState; } /** diff --git a/src/Oro/Bundle/IntegrationBundle/Event/SyncEvent.php b/src/Oro/Bundle/IntegrationBundle/Event/SyncEvent.php new file mode 100644 index 00000000000..c9016ee2ebb --- /dev/null +++ b/src/Oro/Bundle/IntegrationBundle/Event/SyncEvent.php @@ -0,0 +1,70 @@ +jobName = $jobName; + $this->configuration = $configuration; + $this->jobResult = $jobResult; + } + + /** + * @return string + */ + public function getJobName() + { + return $this->jobName; + } + + /** + * @return string + */ + public function getConfiguration() + { + return $this->configuration; + } + + /** + * @param string $configuration + */ + public function setConfiguration($configuration) + { + $this->configuration = $configuration; + } + + /** + * @return JobResult + */ + public function getJobResult() + { + return $this->jobResult; + } +} diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php index 4e91dcc2a15..8622785bdee 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractConnector.php @@ -48,14 +48,6 @@ public function __construct( $this->contextMediator = $contextMediator; } - /** - * {@inheritdoc} - */ - public function getTransport() - { - return $this->transport; - } - /** * {@inheritdoc} */ diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php new file mode 100644 index 00000000000..fc7b67b46d6 --- /dev/null +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php @@ -0,0 +1,110 @@ +processorRegistry = $processorRegistry; + $this->jobExecutor = $jobExecutor; + $this->registry = $registry; + $this->eventDispatcher = $eventDispatcher; + $this->setLogger($logger ?: new LoggerStrategy(new NullLogger())); + } + + /** + * Get logger strategy + * + * @return LoggerStrategy + */ + public function getLoggerStrategy() + { + return $this->logger; + } + + /** + * Format result statistic message based on statistic if context were fetched + * + * @param ContextInterface $context + * + * @return string + */ + protected function formatResultMessage(ContextInterface $context = null) + { + $statistic = $this->fetchStatistic($context); + + return preg_replace_callback( + '#%(\w+)%#', + function ($match) use ($statistic) { + $fieldName = trim(end($match)); + if (isset($statistic[$fieldName])) { + return $statistic[$fieldName]; + } + + return 'UNKNOWN'; + }, + 'Stats: read [%read%], processed [%processed%], updated [%updated%], added [%added%], ' . + 'deleted [%deleted%], invalid entities: [%invalid%]' + ); + } + + /** + * Fetch job execution result statistic from context + * + * @param ContextInterface $context + * + * @return array + */ + private function fetchStatistic(ContextInterface $context = null) + { + $counts = array_fill_keys(['process', 'processed', 'updated', 'deleted', 'added', 'invalid'], 0); + if ($context) { + $counts['read'] = $context->getReadCount(); + $counts['processed'] += $counts['added'] = $context->getAddCount(); + $counts['processed'] += $counts['updated'] = $context->getUpdateCount(); + $counts['processed'] += $counts['deleted'] = $context->getDeleteCount(); + $counts['invalid'] = $context->getErrorEntriesCount(); + } + + return $counts; + } +} diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php b/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php index fb7e506973b..887194e01a9 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/ConnectorInterface.php @@ -33,9 +33,4 @@ public function getImportJobName(); * @return string */ public function getType(); - - /** - * @return TransportInterface - */ - public function getTransport(); } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php b/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php index 918f93b94f5..071722a4718 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/Rest/Transport/AbstractRestTransport.php @@ -43,14 +43,6 @@ public function init(Transport $transportEntity) $this->client = $this->createRestClient($transportEntity); } - /** - * {@inheritdoc} - */ - public function processExceptionMessages(array $exceptions) - { - return $exceptions; - } - /** * Create REST client * diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php index 42f5d5d9307..3570b3e12f8 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/ReverseSyncProcessor.php @@ -2,58 +2,25 @@ namespace Oro\Bundle\IntegrationBundle\Provider; +use Oro\Bundle\IntegrationBundle\Event\SyncEvent; +use Oro\Bundle\ImportExportBundle\Context\ContextInterface; use Oro\Bundle\IntegrationBundle\Exception\LogicException; use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration; -use Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy; -use Oro\Bundle\IntegrationBundle\Manager\TypesRegistry; -use Oro\Bundle\IntegrationBundle\ImportExport\Job\Executor; use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; -class ReverseSyncProcessor +class ReverseSyncProcessor extends AbstractSyncProcessor { - /** @var ProcessorRegistry */ - protected $processorRegistry; - - /** @var Executor */ - protected $jobExecutor; - - /** @var TypesRegistry */ - protected $registry; - - /** @var LoggerStrategy */ - protected $logger; - - /** - * @param ProcessorRegistry $processorRegistry - * @param Executor $jobExecutor - * @param TypesRegistry $registry - * @param LoggerStrategy $logger - */ - public function __construct( - ProcessorRegistry $processorRegistry, - Executor $jobExecutor, - TypesRegistry $registry, - LoggerStrategy $logger - ) { - $this->processorRegistry = $processorRegistry; - $this->jobExecutor = $jobExecutor; - $this->registry = $registry; - $this->logger = $logger; - } - /** * Process channel synchronization * * @param Integration $integration Integration object * @param string $connector Connector name * @param array $parameters Connector additional parameters - * - * @return $this */ public function process(Integration $integration, $connector, array $parameters) { if (!$integration->isEnabled()) { - return $this; + return; } try { @@ -62,11 +29,13 @@ public function process(Integration $integration, $connector, array $parameters) $realConnector = $this->getRealConnector($integration, $connector); if (!($realConnector instanceof TwoWaySyncConnectorInterface)) { - throw new LogicException('This connector doesn`t support two-way sync.'); + throw new LogicException('This connector does not support reverse sync.'); } } catch (\Exception $e) { - return $this->logger->error($e->getMessage()); + $this->logger->error($e->getMessage()); + + return; } $processorAliases = $this->processorRegistry->getProcessorAliasesByEntity( @@ -87,72 +56,47 @@ public function process(Integration $integration, $connector, array $parameters) ]; $this->processExport($realConnector->getExportJobName(), $configuration); - - return $this; } /** - * Get logger strategy - * - * @return LoggerStrategy + * @param string $jobName + * @param array $configuration */ - public function getLoggerStrategy() + protected function processExport($jobName, array $configuration) { - return $this->logger; - } + $event = new SyncEvent($jobName, $configuration); + $this->eventDispatcher->dispatch(SyncEvent::SYNC_BEFORE, $event); + $configuration = $event->getConfiguration(); - /** - * @param $jobName - * @param $configuration - * - * @return $this - */ - protected function processExport($jobName, $configuration) - { $jobResult = $this->jobExecutor->executeJob(ProcessorRegistry::TYPE_EXPORT, $jobName, $configuration); - $context = $jobResult->getContext(); + $this->eventDispatcher->dispatch(SyncEvent::SYNC_AFTER, new SyncEvent($jobName, $configuration, $jobResult)); - $counts = []; + /** @var ContextInterface $contexts */ + $context = $jobResult->getContext(); + $errors = []; if ($context) { - $counts['process'] = $counts['warnings'] = 0; - $counts['read'] = $context->getReadCount(); - $counts['process'] += $counts['add'] = $context->getAddCount(); - $counts['process'] += $counts['update'] = $context->getUpdateCount(); - $counts['process'] += $counts['delete'] = $context->getDeleteCount(); + $errors = $context->getErrors(); } $exceptions = $jobResult->getFailureExceptions(); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); - if (!$isSuccess) { + $message = $this->formatResultMessage($context); + $this->logger->info($message); + + if ($isSuccess) { + if ($errors) { + $warningsText = 'Some entities were skipped due to warnings:' . PHP_EOL; + $warningsText .= implode($errors, PHP_EOL); + $this->logger->warning($warningsText); + } + } else { $this->logger->error('Errors were occurred:'); $exceptions = implode(PHP_EOL, $exceptions); - $this->logger->error( - $exceptions, - ['exceptions' => $jobResult->getFailureExceptions()] - ); - } else { - if ($context->getErrors()) { - $this->logger->warning('Some entities were skipped due to warnings:'); - foreach ($context->getErrors() as $error) { - $this->logger->warning($error); - } - } - $message = sprintf( - "Stats: read [%d], process [%d], updated [%d], added [%d], delete [%d], invalid entities: [%d]", - $counts['read'], - $counts['process'], - $counts['update'], - $counts['add'], - $counts['delete'], - $context->getErrorEntriesCount() - ); - $this->logger->info($message); + $this->logger->error($exceptions); } - - return $this; } /** diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php b/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php index a072adcf0b8..6fb864f6939 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SOAPTransport.php @@ -128,20 +128,6 @@ public function setMultipleAttemptsEnabled($multipleAttemptsEnabled) $this->multipleAttemptsEnabled = $multipleAttemptsEnabled; } - /** - * {@inheritdoc} - */ - public function processExceptionMessages(array $exceptions) - { - $result = []; - - foreach ($exceptions as $exception) { - $result[] = preg_replace("/(.*)<\/apiKey>/i", "", $exception); - } - - return $result; - } - /** * @param string $wsdlUrl * diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php index 7affac8da81..68d89730536 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/SyncProcessor.php @@ -2,41 +2,26 @@ namespace Oro\Bundle\IntegrationBundle\Provider; -use Oro\Bundle\IntegrationBundle\Event\AfterJobExecutionEvent; -use Symfony\Bridge\Doctrine\RegistryInterface; +use Doctrine\Common\Persistence\ManagerRegistry; + +use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Oro\Bundle\ImportExportBundle\Context\ContextInterface; use Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry; -use Oro\Bundle\ImportExportBundle\Job\JobResult; use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration; use Oro\Bundle\IntegrationBundle\Entity\Status; use Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy; use Oro\Bundle\IntegrationBundle\Manager\TypesRegistry; use Oro\Bundle\IntegrationBundle\ImportExport\Job\Executor; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Oro\Bundle\IntegrationBundle\Event\SyncEvent; -class SyncProcessor +class SyncProcessor extends AbstractSyncProcessor { - /** @var RegistryInterface */ + /** @var ManagerRegistry */ protected $doctrineRegistry; - /** @var ProcessorRegistry */ - protected $processorRegistry; - - /** @var Executor */ - protected $jobExecutor; - - /** @var TypesRegistry */ - protected $registry; - - /** @var LoggerStrategy */ - protected $logger; - - /** @var EventDispatcherInterface */ - protected $eventDispatcher; - /** - * @param RegistryInterface $doctrineRegistry + * @param ManagerRegistry $doctrineRegistry * @param ProcessorRegistry $processorRegistry * @param Executor $jobExecutor * @param TypesRegistry $registry @@ -44,19 +29,16 @@ class SyncProcessor * @param EventDispatcherInterface $eventDispatcher */ public function __construct( - RegistryInterface $doctrineRegistry, + ManagerRegistry $doctrineRegistry, ProcessorRegistry $processorRegistry, Executor $jobExecutor, TypesRegistry $registry, - LoggerStrategy $logger, - EventDispatcherInterface $eventDispatcher + EventDispatcherInterface $eventDispatcher, + LoggerStrategy $logger = null ) { - $this->doctrineRegistry = $doctrineRegistry; - $this->processorRegistry = $processorRegistry; - $this->jobExecutor = $jobExecutor; - $this->registry = $registry; - $this->logger = $logger; - $this->eventDispatcher = $eventDispatcher; + $this->doctrineRegistry = $doctrineRegistry; + + parent::__construct($processorRegistry, $jobExecutor, $registry, $eventDispatcher, $logger); } /** @@ -121,16 +103,6 @@ protected function processConnectors(Integration $integration, array $parameters return $isSuccess; } - /** - * Get logger strategy - * - * @return LoggerStrategy - */ - public function getLoggerStrategy() - { - return $this->logger; - } - /** * Process integration connector * @@ -204,23 +176,22 @@ protected function processIntegrationConnector( */ protected function processImport($connector, $jobName, $configuration, Integration $integration, $saveStatus) { + $event = new SyncEvent($jobName, $configuration); + $this->eventDispatcher->dispatch(SyncEvent::SYNC_BEFORE, $event); + $configuration = $event->getConfiguration(); + $jobResult = $this->jobExecutor->executeJob(ProcessorRegistry::TYPE_IMPORT, $jobName, $configuration); + $this->eventDispatcher->dispatch(SyncEvent::SYNC_AFTER, new SyncEvent($jobName, $configuration, $jobResult)); + /** @var ContextInterface $contexts */ $context = $jobResult->getContext(); - $counts = array_fill_keys(['process', 'read', 'update', 'delete', 'add'], 0); - $connectorData = []; + $connectorData = $errors = []; if ($context) { - $counts['read'] = $context->getReadCount(); - $counts['process'] += $counts['add'] = $context->getAddCount(); - $counts['process'] += $counts['update'] = $context->getUpdateCount(); - $counts['process'] += $counts['delete'] = $context->getDeleteCount(); $connectorData = $context->getValue(ConnectorInterface::CONTEXT_CONNECTOR_DATA_KEY); + $errors = $context->getErrors(); } - - $this->eventDispatcher->dispatch(AfterJobExecutionEvent::NAME, new AfterJobExecutionEvent($jobResult)); - $exceptions = $jobResult->getFailureExceptions(); $isSuccess = $jobResult->isSuccessful() && empty($exceptions); @@ -228,36 +199,25 @@ protected function processImport($connector, $jobName, $configuration, Integrati $status->setConnector($connector); $status->setData(is_array($connectorData) ? $connectorData : []); - $message = sprintf( - "Stats: read [%d], process [%d], updated [%d], added [%d], delete [%d], invalid entities: [%d]", - $counts['read'], - $counts['process'], - $counts['update'], - $counts['add'], - $counts['delete'], - $context->getErrorEntriesCount() - ); + $message = $this->formatResultMessage($context); $this->logger->info($message); - if (!$isSuccess) { + if ($isSuccess) { + if ($errors) { + $warningsText = 'Some entities were skipped due to warnings:' . PHP_EOL; + $warningsText .= implode($errors, PHP_EOL); + $this->logger->warning($warningsText); + + $message .= PHP_EOL . $warningsText; + } + + $status->setCode(Status::STATUS_COMPLETED)->setMessage($message); + } else { $this->logger->error('Errors were occurred:'); $exceptions = implode(PHP_EOL, $exceptions); $this->logger->error($exceptions); $status->setCode(Status::STATUS_FAILED)->setMessage($exceptions); - } else { - $warningsText = PHP_EOL; - - if ($context->getErrors()) { - $warningsText .= 'Some entities were skipped due to warnings:' . PHP_EOL; - foreach ($context->getErrors() as $error) { - $warningsText .= $error . PHP_EOL; - } - - $this->logger->warning($warningsText); - } - - $status->setCode(Status::STATUS_COMPLETED)->setMessage($message . $warningsText); } if ($saveStatus) { diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php b/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php index 9787631c021..3f1a4d486b8 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/TransportInterface.php @@ -31,11 +31,4 @@ public function getSettingsFormType(); * @return string */ public function getSettingsEntityFQCN(); - - /** - * @param array $messages - * - * @return array - */ - public function processExceptionMessages(array $messages); } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/TwoWaySyncConnectorInterface.php b/src/Oro/Bundle/IntegrationBundle/Provider/TwoWaySyncConnectorInterface.php index b9a58bd5a8d..329afb96447 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/TwoWaySyncConnectorInterface.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/TwoWaySyncConnectorInterface.php @@ -2,7 +2,7 @@ namespace Oro\Bundle\IntegrationBundle\Provider; -interface TwoWaySyncConnectorInterface +interface TwoWaySyncConnectorInterface extends ConnectorInterface { const REMOTE_WINS = 'remote'; const LOCAL_WINS = 'local'; diff --git a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml index 6bc7dfbb0b5..e165c3945ec 100644 --- a/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/IntegrationBundle/Resources/config/services.yml @@ -157,8 +157,8 @@ services: - @oro_importexport.processor.registry - @oro_integration.job_executor - @oro_integration.manager.types_registry - - @oro_integration.logger.strategy - @event_dispatcher + - @oro_integration.logger.strategy lazy: true oro_integration.provider.connector_context_mediator: @@ -186,6 +186,7 @@ services: - @oro_importexport.processor.registry - @oro_integration.job_executor - @oro_integration.manager.types_registry + - @event_dispatcher - @oro_integration.logger.strategy lazy: true diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php index bc23b4453d3..0dbb37a036e 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestConnector.php @@ -37,12 +37,4 @@ public function getType() { return 'test Type'; } - - /** - * {@inheritdoc} - */ - public function getTransport() - { - return new TestTransport(); - } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php index 828027fd9de..ebf8134cfe5 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Fixture/TestTransport.php @@ -38,12 +38,4 @@ public function getSettingsEntityFQCN() { return 'FQCN'; } - - /** - * {@inheritdoc} - */ - public function processExceptionMessages(array $exceptions) - { - return $exceptions; - } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php index c222841e10c..3a6e0f5e9c2 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/ReverseSyncProcessorTest.php @@ -26,32 +26,30 @@ class ReverseSyncProcessorTest extends \PHPUnit_Framework_TestCase /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $log; - /** - * Setup test obj and mock - */ + /** @var \PHPUnit_Framework_MockObject_MockObject */ + protected $eventDispatcher; + public function setUp() { $this->processorRegistry = $this->getMock('Oro\Bundle\ImportExportBundle\Processor\ProcessorRegistry'); - - $this->jobExecutor = $this->getMockBuilder('Oro\Bundle\IntegrationBundle\ImportExport\Job\Executor') - ->disableOriginalConstructor() - ->getMock(); - - $this->registry = $this->getMock('Oro\Bundle\IntegrationBundle\Manager\TypesRegistry'); - $this->integration = $this->getMock('Oro\Bundle\IntegrationBundle\Entity\Channel'); - $this->log = $this->getMock('Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy'); - - $this->log->expects($this->any()) - ->method('info') - ->will($this->returnValue('')); + $this->jobExecutor = $this->getMockBuilder('Oro\Bundle\IntegrationBundle\ImportExport\Job\Executor') + ->disableOriginalConstructor()->getMock(); + $this->registry = $this->getMock('Oro\Bundle\IntegrationBundle\Manager\TypesRegistry'); + $this->integration = $this->getMock('Oro\Bundle\IntegrationBundle\Entity\Channel'); + $this->log = $this->getMock('Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy'); + $this->eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); } - /** - * Tear down - */ public function tearDown() { - unset($this->processorRegistry, $this->registry, $this->jobExecutor, $this->processor, $this->log); + unset( + $this->processorRegistry, + $this->registry, + $this->jobExecutor, + $this->processor, + $this->eventDispatcher, + $this->log + ); } /** @@ -138,6 +136,7 @@ protected function getReverseSyncProcessor($mockedMethods = null) $this->processorRegistry, $this->jobExecutor, $this->registry, + $this->eventDispatcher, $this->log ] ); diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SoapTransportTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SoapTransportTest.php index 1da0d343237..acff684fdac 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SoapTransportTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SoapTransportTest.php @@ -171,19 +171,4 @@ public function testMultipleAttempt() $this->transport->init($this->transportEntity); $this->transport->call('test'); } - - public function testProcessExceptionMessages() - { - $message = '' . - 'abc' . - 'abcabc1'; - - $validMessage = '' . - 'abc' . - ''; - - $result = $this->transport->processExceptionMessages([$message]); - - $this->assertEquals([$validMessage], $result); - } } diff --git a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php index 63d5d922117..773e812b035 100644 --- a/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php +++ b/src/Oro/Bundle/IntegrationBundle/Tests/Unit/Provider/SyncProcessorTest.php @@ -28,6 +28,9 @@ class SyncProcessorTest extends \PHPUnit_Framework_TestCase /** @var \PHPUnit_Framework_MockObject_MockObject */ protected $log; + /** @var \PHPUnit_Framework_MockObject_MockObject */ + protected $eventDispatcher; + /** * Setup test obj and mock */ @@ -44,17 +47,23 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); - $this->registry = $this->getMock('Oro\Bundle\IntegrationBundle\Manager\TypesRegistry'); - $this->integration = $this->getMock('Oro\Bundle\IntegrationBundle\Entity\Channel'); - $this->log = $this->getMock('Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy'); + $this->registry = $this->getMock('Oro\Bundle\IntegrationBundle\Manager\TypesRegistry'); + $this->integration = $this->getMock('Oro\Bundle\IntegrationBundle\Entity\Channel'); + $this->log = $this->getMock('Oro\Bundle\IntegrationBundle\Logger\LoggerStrategy'); + $this->eventDispatcher = $this->getMock('Symfony\Component\EventDispatcher\EventDispatcherInterface'); } - /** - * Tear down - */ protected function tearDown() { - unset($this->em, $this->processorRegistry, $this->registry, $this->jobExecutor, $this->processor, $this->log); + unset( + $this->em, + $this->eventDispatcher, + $this->processorRegistry, + $this->registry, + $this->jobExecutor, + $this->processor, + $this->log + ); } /** @@ -85,6 +94,7 @@ protected function getSyncProcessor($mockedMethods = null) $this->processorRegistry, $this->jobExecutor, $this->registry, + $this->eventDispatcher, $this->log ] ); @@ -133,7 +143,7 @@ public function testOneChannelConnectorProcess() $realConnector = new TestConnector(); $this->registry - ->expects($this->exactly(2)) + ->expects($this->once()) ->method('getConnectorType') ->will($this->returnValue($realConnector)); From ef37c738de7a2d43c43003420554b8fb5d507a98 Mon Sep 17 00:00:00 2001 From: Alexandr Smaga Date: Tue, 25 Nov 2014 20:21:10 +0200 Subject: [PATCH 23/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs - added cast to in --- .../Provider/AbstractSyncProcessor.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php index fc7b67b46d6..8f25e334be1 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php @@ -98,11 +98,11 @@ private function fetchStatistic(ContextInterface $context = null) { $counts = array_fill_keys(['process', 'processed', 'updated', 'deleted', 'added', 'invalid'], 0); if ($context) { - $counts['read'] = $context->getReadCount(); - $counts['processed'] += $counts['added'] = $context->getAddCount(); - $counts['processed'] += $counts['updated'] = $context->getUpdateCount(); - $counts['processed'] += $counts['deleted'] = $context->getDeleteCount(); - $counts['invalid'] = $context->getErrorEntriesCount(); + $counts['read'] = (int)$context->getReadCount(); + $counts['processed'] += $counts['added'] = (int)$context->getAddCount(); + $counts['processed'] += $counts['updated'] = (int)$context->getUpdateCount(); + $counts['processed'] += $counts['deleted'] = (int)$context->getDeleteCount(); + $counts['invalid'] = (int)$context->getErrorEntriesCount(); } return $counts; From bb1aff747a88c9a3a78912f75b06f9efb0587ca5 Mon Sep 17 00:00:00 2001 From: Alexandr Smaga Date: Wed, 26 Nov 2014 09:48:09 +0200 Subject: [PATCH 24/27] CRM-2152 Magento Integration: Sensitive data displayed in API request logs - code style fixes --- src/Oro/Bundle/ImportExportBundle/Job/JobResult.php | 6 +++--- .../IntegrationBundle/Provider/AbstractSyncProcessor.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php index 5285cb64496..76fa0f9abb9 100644 --- a/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php +++ b/src/Oro/Bundle/ImportExportBundle/Job/JobResult.php @@ -76,13 +76,13 @@ public function addFailureException($failureException) } /** - * @param array $failureException + * @param array $exceptions * * @return $this */ - public function setFailureExceptions(array $failureException) + public function setFailureExceptions(array $exceptions) { - $this->failureExceptions = $failureException; + $this->failureExceptions = $exceptions; return $this; } diff --git a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php index 8f25e334be1..c6ecf6dea76 100644 --- a/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php +++ b/src/Oro/Bundle/IntegrationBundle/Provider/AbstractSyncProcessor.php @@ -96,7 +96,7 @@ function ($match) use ($statistic) { */ private function fetchStatistic(ContextInterface $context = null) { - $counts = array_fill_keys(['process', 'processed', 'updated', 'deleted', 'added', 'invalid'], 0); + $counts = array_fill_keys(['read', 'processed', 'updated', 'deleted', 'added', 'invalid'], 0); if ($context) { $counts['read'] = (int)$context->getReadCount(); $counts['processed'] += $counts['added'] = (int)$context->getAddCount(); From 5fb8d866ef6a9739e4cb9b6b463b5e62a4132436 Mon Sep 17 00:00:00 2001 From: Alexandr Smaga Date: Wed, 26 Nov 2014 10:04:05 +0200 Subject: [PATCH 25/27] CRM-2152: Magento Integration: Sensitive data displayed in API request logs - update verbosity level for reverse sync command --- .../Bundle/IntegrationBundle/Command/ReverseSyncCommand.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php index 8762cf18e7c..e305d43904f 100644 --- a/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php +++ b/src/Oro/Bundle/IntegrationBundle/Command/ReverseSyncCommand.php @@ -48,6 +48,10 @@ public function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { + if ($output->getVerbosity() < OutputInterface::VERBOSITY_VERBOSE) { + $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE); + } + $integrationId = $input->getOption(self::INTEGRATION_ARG_NAME); $connectorType = $input->getOption(self::CONNECTOR_ARG_NAME); $params = $input->getOption(self::PARAMETERS_ARG_NAME); From c6cfcf1db91a8b235c5b9071dea369b04a9d2746 Mon Sep 17 00:00:00 2001 From: Vova Soroka Date: Thu, 27 Nov 2014 05:14:46 +0200 Subject: [PATCH 26/27] BAP-6622: IMAP Sync failed with exception --- .../ImapBundle/Manager/ImapEmailManager.php | 26 ++-- .../Unit/Manager/ImapEmailManagerTest.php | 112 +++++++++--------- .../Tests/Unit/Util/DateTimeParserTest.php | 68 +++++++++++ .../Bundle/ImapBundle/Util/DateTimeParser.php | 108 +++++++++++++++++ 4 files changed, 248 insertions(+), 66 deletions(-) create mode 100644 src/Oro/Bundle/ImapBundle/Tests/Unit/Util/DateTimeParserTest.php create mode 100644 src/Oro/Bundle/ImapBundle/Util/DateTimeParser.php diff --git a/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php b/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php index 46a58a6fb97..9e6cb8ffe9c 100644 --- a/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php +++ b/src/Oro/Bundle/ImapBundle/Manager/ImapEmailManager.php @@ -10,11 +10,12 @@ use Oro\Bundle\ImapBundle\Connector\ImapConnector; use Oro\Bundle\ImapBundle\Connector\Search\SearchQuery; +use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Manager\DTO\ItemId; use Oro\Bundle\ImapBundle\Manager\DTO\Email; use Oro\Bundle\ImapBundle\Mail\Storage\Folder; -use Oro\Bundle\ImapBundle\Connector\Search\SearchQueryBuilder; use Oro\Bundle\ImapBundle\Mail\Storage\Message; +use Oro\Bundle\ImapBundle\Util\DateTimeParser; class ImapEmailManager { @@ -197,10 +198,7 @@ protected function getDateTime(Headers $headers, $name) { $val = $headers->get($name); if ($val instanceof HeaderInterface) { - $dt = new \DateTime($val->getFieldValue()); - $dt->setTimezone(new \DateTimeZone('UTC')); - - return $dt; + return $this->convertToDateTime($val->getFieldValue()); } return new \DateTime('0001-01-01', new \DateTimeZone('UTC')); @@ -227,10 +225,8 @@ protected function getReceivedAt(Headers $headers) $delim = strrpos($str, ';'); if ($delim !== false) { $str = trim(preg_replace('@[\r\n]+@', '', substr($str, $delim + 1))); - $dt = new \DateTime($str); - $dt->setTimezone(new \DateTimeZone('UTC')); - return $dt; + return $this->convertToDateTime($str); } return new \DateTime('0001-01-01', new \DateTimeZone('UTC')); @@ -294,4 +290,18 @@ protected function getImportance(Headers $headers) return 0; } + + /** + * Convert a string to DateTime + * + * @param string $value + * + * @return \DateTime + * + * @throws \Exception + */ + protected function convertToDateTime($value) + { + return DateTimeParser::parse($value); + } } diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/ImapEmailManagerTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/ImapEmailManagerTest.php index e56e6b2379e..06997b2fab3 100644 --- a/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/ImapEmailManagerTest.php +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Manager/ImapEmailManagerTest.php @@ -2,8 +2,9 @@ namespace Oro\Bundle\ImapBundle\Tests\Unit\Manager\DTO; +use Zend\Mail\Header\HeaderInterface; + use Oro\Bundle\ImapBundle\Connector\ImapMessageIterator; -use Oro\Bundle\ImapBundle\Manager\ImapEmailIterator; use Oro\Bundle\ImapBundle\Manager\ImapEmailManager; class ImapEmailManagerTest extends \PHPUnit_Framework_TestCase @@ -36,76 +37,49 @@ public function testSelectFolder() } /** + * @dataProvider getEmailsProvider * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function testGetEmails() + public function testGetEmails($strDate) { - $uid = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $uid->expects($this->once())->method('getFieldValue')->will($this->returnValue('123')); - - $subject = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $subject->expects($this->once())->method('getFieldValue')->will($this->returnValue('Subject')); - - $fromEmail = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $fromEmail->expects($this->once())->method('getFieldValue')->will($this->returnValue('fromEmail')); - - $date = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $date->expects($this->once())->method('getFieldValue')->will($this->returnValue('2011-06-30 23:59:59 +0')); - - $received = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $received->expects($this->once())->method('getFieldValue') - ->will($this->returnValue('by server to email; 2012-06-30 23:59:59 +0')); - - $intDate = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $intDate->expects($this->once())->method('getFieldValue')->will($this->returnValue('2013-06-30 23:59:59 +0')); - - $messageId = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $messageId->expects($this->once())->method('getFieldValue')->will($this->returnValue('MessageId')); - - $xMsgId = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $xMsgId->expects($this->once())->method('getFieldValue')->will($this->returnValue('XMsgId')); - - $xThrId = $this->getMock('Zend\Mail\Header\HeaderInterface'); - $xThrId->expects($this->once())->method('getFieldValue')->will($this->returnValue('XThrId')); - $toAddress = $this->getMock('Zend\Mail\Address\AddressInterface'); $toAddress->expects($this->once())->method('toString')->will($this->returnValue('toEmail')); $toAddressList = $this->getMockForAbstractClass( 'Zend\Mail\Header\AbstractAddressList', - array(), + [], '', false, false, true, - array('getAddressList') + ['getAddressList'] ); - $toAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue(array($toAddress))); + $toAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue([$toAddress])); $ccAddress = $this->getMock('Zend\Mail\Address\AddressInterface'); $ccAddress->expects($this->once())->method('toString')->will($this->returnValue('ccEmail')); $ccAddressList = $this->getMockForAbstractClass( 'Zend\Mail\Header\AbstractAddressList', - array(), + [], '', false, false, true, - array('getAddressList') + ['getAddressList'] ); - $ccAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue(array($ccAddress))); + $ccAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue([$ccAddress])); $bccAddress = $this->getMock('Zend\Mail\Address\AddressInterface'); $bccAddress->expects($this->once())->method('toString')->will($this->returnValue('bccEmail')); $bccAddressList = $this->getMockForAbstractClass( 'Zend\Mail\Header\AbstractAddressList', - array(), + [], '', false, false, true, - array('getAddressList') + ['getAddressList'] ); - $bccAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue(array($bccAddress))); + $bccAddressList->expects($this->once())->method('getAddressList')->will($this->returnValue([$bccAddress])); $this->connector->expects($this->once()) ->method('getUidValidity') @@ -123,22 +97,22 @@ public function testGetEmails() ->method('get') ->will( $this->returnValueMap( - array( - array('UID', $uid), - array('Subject', $subject), - array('From', $fromEmail), - array('Date', $date), - array('Received', $received), - array('InternalDate', $intDate), - array('Importance', false), - array('Message-ID', $messageId), - array('X-GM-MSG-ID', $xMsgId), - array('X-GM-THR-ID', $xThrId), - array('X-GM-LABELS', false), - array('To', $toAddressList), - array('Cc', $ccAddressList), - array('Bcc', $bccAddressList), - ) + [ + ['UID', $this->getHeader('123')], + ['Subject', $this->getHeader('Subject')], + ['From', $this->getHeader('fromEmail')], + ['Date', $this->getHeader($strDate)], + ['Received', $this->getHeader('by server to email; ' . str_replace('59:', '58:', $strDate))], + ['InternalDate', $this->getHeader(str_replace('59:', '57:', $strDate))], + ['Importance', false], + ['Message-ID', $this->getHeader('MessageId')], + ['X-GM-MSG-ID', $this->getHeader('XMsgId')], + ['X-GM-THR-ID', $this->getHeader('XThrId')], + ['X-GM-LABELS', false], + ['To', $toAddressList], + ['Cc', $ccAddressList], + ['Bcc', $bccAddressList], + ] ) ); @@ -150,7 +124,7 @@ public function testGetEmails() ->disableOriginalConstructor() ->getMock(); $imap->expects($this->any())->method('getMessage')->will($this->returnValue($msg)); - $messageIterator = new ImapMessageIterator($imap, array(1)); + $messageIterator = new ImapMessageIterator($imap, [1]); $this->connector->expects($this->once()) ->method('findItems') ->with($this->identicalTo($query)) @@ -172,11 +146,11 @@ public function testGetEmails() $email->getSentAt() ); $this->assertEquals( - new \DateTime('2012-06-30 23:59:59', new \DateTimeZone('UTC')), + new \DateTime('2011-06-30 23:58:59', new \DateTimeZone('UTC')), $email->getReceivedAt() ); $this->assertEquals( - new \DateTime('2013-06-30 23:59:59', new \DateTimeZone('UTC')), + new \DateTime('2011-06-30 23:57:59', new \DateTimeZone('UTC')), $email->getInternalDate() ); $this->assertEquals(0, $email->getImportance()); @@ -190,4 +164,26 @@ public function testGetEmails() $bccRecipients = $email->getBccRecipients(); $this->assertEquals('bccEmail', $bccRecipients[0]); } + + public function getEmailsProvider() + { + return [ + ['Fri, 31 Jun 2011 10:59:59 +1100'], + ['Fri, 31 Jun 2011 10:59:59 +11:00 (GMT+11:00)'], + ['Fri, 31 06 2011 10:59:59 +1100'], + ]; + } + + /** + * @return HeaderInterface + */ + protected function getHeader($value) + { + $header = $this->getMock('Zend\Mail\Header\HeaderInterface'); + $header->expects($this->once()) + ->method('getFieldValue') + ->will($this->returnValue($value)); + + return $header; + } } diff --git a/src/Oro/Bundle/ImapBundle/Tests/Unit/Util/DateTimeParserTest.php b/src/Oro/Bundle/ImapBundle/Tests/Unit/Util/DateTimeParserTest.php new file mode 100644 index 00000000000..98e866fa0cf --- /dev/null +++ b/src/Oro/Bundle/ImapBundle/Tests/Unit/Util/DateTimeParserTest.php @@ -0,0 +1,68 @@ +assertEquals( + new \DateTime('2011-06-30 23:59:59', new \DateTimeZone('UTC')), + DateTimeParser::parse($strDate) + ); + } + + public function parseProvider() + { + return [ + ['Thu, 30 Jun 2011 23:59:59'], + ['Thu, 30 Jun 2011 23:59:59 GMT'], + ['Thu, 30 Jun 2011 23:59:59 UTC'], + ['Thu, 30 Jun 2011 23:59:59 UT'], + ['Thu, 30 Jun 2011 23:59:59 UT (Universal Time)'], + ['Thu, 30 Jun 2011 12:59:59 -1100'], + ['Fri, 31 Jun 2011 10:59:59 +1100'], + ['Fri, 31 Jun 2011 10:59:59 +1100 (AEDT)'], + ['Fri, 31 Jun 2011 10:59:59 +1100 (GMT+11:00)'], + ['Fri, 31 Jun 2011 10:59:59 +1100 (Australian Eastern Daylight Time)'], + ['Fri, 31 Jun 2011 10:59:59 +11:00 (AEDT)'], + ['Fri, 31 Jun 2011 10:59:59 +11:00 (GMT+11:00)'], + ['Fri, 31 Jun 2011 10:59:59 +11:00 (Australian Eastern Daylight Time)'], + ['Thu, 30 06 2011 23:59:59'], + ['Fri, 31 06 2011 10:59:59 +1100'], + ['Fri, 31 06 2011 10:59:59 +1100 (GMT+11:00)'], + ]; + } + + /** + * @dataProvider parseFailureProvider + */ + public function testParseFailure($strDate, $exceptionMessage) + { + $this->setExpectedException('\InvalidArgumentException', $exceptionMessage); + DateTimeParser::parse($strDate); + } + + public function parseFailureProvider() + { + return [ + [ + 'invalid', + 'Failed to parse time string "invalid" at position 0: The timezone could not be found in the database.' + ], + [ + 'Fri, 31 June 2011 10:59:aa +1100', + 'Failed to parse time string "Fri, 31 June 2011 10:59:aa +1100" at position 23: Unexpected character.' + ], + [ + 'Fri, 31 06 2011 10:59:aa +1100', + 'Failed to parse time string "Fri, 31 06 2011 10:59:aa +1100" at position 5: Unexpected character.' + ], + ]; + } +} diff --git a/src/Oro/Bundle/ImapBundle/Util/DateTimeParser.php b/src/Oro/Bundle/ImapBundle/Util/DateTimeParser.php new file mode 100644 index 00000000000..4f6892f8661 --- /dev/null +++ b/src/Oro/Bundle/ImapBundle/Util/DateTimeParser.php @@ -0,0 +1,108 @@ +setTimezone(new \DateTimeZone('UTC')); + } + + return $date; + } + + /** + * @param string $value + * + * @return string + */ + protected static function getDateTimeLastError($value) + { + $msg = null; + $errors = \DateTime::getLastErrors(); + if (!$msg && !empty($errors['warnings'])) { + foreach ($errors['errors'] as $pos => $err) { + $msg = sprintf('at position %d: (warning) %s', $pos, $err); + break; + } + } + if (!empty($errors['errors'])) { + foreach ($errors['errors'] as $pos => $err) { + $msg = sprintf('at position %d: %s', $pos, $err); + break; + } + } + + return sprintf( + 'Failed to parse time string "%s" %s.', + $value, + $msg ?: ': Unknown error' + ); + } +} From d7e121dc68c27527a7b262052d2a3daecf9f9cef Mon Sep 17 00:00:00 2001 From: Ignat Shcheglovskyi Date: Thu, 27 Nov 2014 16:36:02 +0200 Subject: [PATCH 27/27] FG-78: Run insecure content from websockets when HTTPS used - extend condition to handle cases of using wss when https is used --- src/Oro/Bundle/SyncBundle/Resources/views/sync_js.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Oro/Bundle/SyncBundle/Resources/views/sync_js.html.twig b/src/Oro/Bundle/SyncBundle/Resources/views/sync_js.html.twig index fa9e88d9bd3..4f200314f4f 100644 --- a/src/Oro/Bundle/SyncBundle/Resources/views/sync_js.html.twig +++ b/src/Oro/Bundle/SyncBundle/Resources/views/sync_js.html.twig @@ -9,7 +9,7 @@ }); sync(new Wamp({ - secure: {{ app.request.headers.get('X-Forwarded-Proto') == 'https' ? 'true' : 'false' }}, + secure: {{ app.request.headers.get('X-Forwarded-Proto') == 'https' or app.request.isSecure() ? 'true' : 'false' }}, host: '{{ ws.host == '*' ? app.request.headers.get('host') : ws.host }}', port: {{ ws.port|json_encode|raw }}, maxRetries: 3,