Merge remote-tracking branch 'remotes/dev/1.10' into 1.10

src/OroCRM/Bundle/AccountBundle/Tests/Unit/Entity/AccountTest.php

@@ -22,7 +22,6 @@ public function testGettersSetters()
         $this->assertNull($entity->getOrganization());
         $entity->setOrganization($organization);
         $this->assertSame($organization, $entity->getOrganization());
-
     }
 
     public function testBeforeSave()

src/OroCRM/Bundle/CampaignBundle/Tests/Selenium/Pages/Campaign.php

@@ -49,17 +49,14 @@ public function setStartDate($contact)
 
     public function setEndDate()
     {
-
     }
 
     public function setDescription()
     {
-
     }
 
     public function setBudget()
     {
-
     }
 
     /**

src/OroCRM/Bundle/ChannelBundle/Tests/Unit/Form/Extension/SingleChannelModeExtensionTest.php

@@ -60,7 +60,6 @@ public function testBuildForm(array $entities, array $channels, callable $callba
         }
 
         $this->extension->buildForm($builder, ['entities' => $entities, 'single_channel_mode' => true]);
-
     }
 
     /**

src/OroCRM/Bundle/ContactBundle/Entity/Contact.php

@@ -19,6 +19,7 @@
 use Oro\Bundle\UserBundle\Entity\User;
 
 use OroCRM\Bundle\AccountBundle\Entity\Account;
+use OroCRM\Bundle\ContactBundle\Entity\ContactAddress;
 use OroCRM\Bundle\ContactBundle\Model\ExtendContact;
 
 /**
@@ -1335,6 +1336,10 @@ public function setPrimaryPhone(ContactPhone $phone)
      */
     public function addAddress(AbstractAddress $address)
     {
+        if (!$address instanceof ContactAddress) {
+            throw new \InvalidArgumentException("Address must be instance of ContactAddress");
+        }
+
         /** @var ContactAddress $address */
         if (!$this->addresses->contains($address)) {
             //don't allow more than one primary address

src/OroCRM/Bundle/ContactBundle/Resources/config/validation.yml

@@ -42,10 +42,3 @@ OroCRM\Bundle\ContactBundle\Entity\Group:
 OroCRM\Bundle\ContactBundle\Entity\ContactAddress:
     constraints:
         - Oro\Bundle\AddressBundle\Validator\Constraints\ValidRegion: { groups: ['RequirePeriod'] }
-    properties:
-        street:
-            - NotBlank: ~
-        city:
-            - NotBlank: ~
-        postalCode:
-            - NotBlank: ~

src/OroCRM/Bundle/ContactBundle/Tests/Selenium/Pages/Contact.php

@@ -146,7 +146,6 @@ public function setAddressFirstName($value, $addressId = 0)
         $addressFirstName->value($value);
 
         return $this;
-
     }
 
     public function getAddressFirstName($addressId = 0)
@@ -169,7 +168,6 @@ public function setAddressLastName($value, $addressId = 0)
         $addressLastName->value($value);
 
         return $this;
-
     }
 
     public function getAddressLastName($addressId = 0)

src/OroCRM/Bundle/ContactUsBundle/Migrations/Schema/v1_10/FillActivityAssociationTables.php

@@ -99,7 +99,6 @@ public function up(Schema $schema, QueryBag $queries)
         $table->removeForeignKey('FK_6F7A50CE427EB8A5');
         $table->removeForeignKey('FK_6F7A50CE50A89B2C');
         $schema->dropTable('orocrm_contactus_request_calls');
-
     }
 
     /**

src/OroCRM/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadReportData.php

@@ -85,7 +85,6 @@ public function loadReports()
         }
 
         $this->flush($this->em);
-
     }
 
     /**

src/OroCRM/Bundle/DemoDataBundle/Migrations/Data/Demo/ORM/LoadUserData.php

@@ -53,7 +53,6 @@ public function setContainer(ContainerInterface $container = null)
         $this->group = $entityManager->getRepository('OroUserBundle:Group');
         $this->user = $entityManager->getRepository('OroUserBundle:User');
         $this->tagManager = $container->get('oro_tag.tag.manager');
-
     }
 
     public function load(ObjectManager $manager)

src/OroCRM/Bundle/MagentoBundle/Controller/Api/Rest/CustomerAddressController.php

@@ -87,7 +87,6 @@ public function postAction($customerId)
             } else {
                 $view = $this->view($this->getForm(), Codes::HTTP_BAD_REQUEST);
             }
-
         } else {
             $view = $this->view($this->getForm(), Codes::HTTP_NOT_FOUND);
         }

src/OroCRM/Bundle/MagentoBundle/DependencyInjection/Configuration.php

@@ -43,7 +43,7 @@ public function getConfigTreeBuilder()
                             )
                             ->example('10 minutes')
                         ->end()
-                        ->scalarNode('initial_import_step_interval')
+                        ->scalarNode('import_step_interval')
                             ->defaultValue('7 days')
                             ->cannotBeEmpty()
                             ->info(

src/OroCRM/Bundle/MagentoBundle/ImportExport/Writer/ProxyEntityWriter.php

@@ -83,7 +83,6 @@ public function write(array $items)
                     $uniqueKeys[] = $identifier;
                     $uniqueItems[] = $item;
                 }
-
             } else {
                 $uniqueItems[] = $item;
             }

src/OroCRM/Bundle/MagentoBundle/Migrations/Data/ORM/CreateSyncStatusForExistingConnectors.php

@@ -65,7 +65,7 @@ protected function addInitialStatus(ChannelRepository $repository, Channel $inte
         $now = new \DateTime('now', new \DateTimeZone('UTC'));
 
         $status = new Status();
-        $status->setData([AbstractInitialProcessor::INITIAL_SYNCED_TO => $syncStartDate->format(\DateTime::ISO8601)]);
+        $status->setData([AbstractInitialProcessor::SYNCED_TO => $syncStartDate->format(\DateTime::ISO8601)]);
         $status->setConnector($connector);
         $status->setDate($now);
         $status->setChannel($integration);

src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/OroCRMMagentoBundleInstaller.php

@@ -110,7 +110,7 @@ public function setVisitEventAssociationExtension(VisitEventAssociationExtension
      */
     public function getMigrationVersion()
     {
-        return 'v1_41_1';
+        return 'v1_41_2';
     }
 
     /**

src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_40/CreateActivityAssociation.php

@@ -52,8 +52,10 @@ public function up(Schema $schema, QueryBag $queries)
      */
     public static function addActivityAssociations(Schema $schema, ActivityExtension $activityExtension)
     {
-        $associationTableName = $activityExtension
-            ->getAssociationTableName('oro_calendar_event', 'orocrm_magento_order');
+        $associationTableName = $activityExtension->getAssociationTableName(
+            'oro_calendar_event',
+            'orocrm_magento_order'
+        );
         if (!$schema->hasTable($associationTableName)) {
             $activityExtension->addActivityAssociation($schema, 'oro_calendar_event', 'orocrm_magento_order');
         }

src/OroCRM/Bundle/MagentoBundle/Migrations/Schema/v1_41_2/CreateActivityAssociation.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace OroCRM\Bundle\MagentoBundle\Migrations\Schema\v1_41_2;
+
+use Doctrine\DBAL\Schema\Schema;
+
+use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtension;
+use Oro\Bundle\ActivityBundle\Migration\Extension\ActivityExtensionAwareInterface;
+use Oro\Bundle\MigrationBundle\Migration\Migration;
+use Oro\Bundle\MigrationBundle\Migration\QueryBag;
+
+class CreateActivityAssociation implements Migration, ActivityExtensionAwareInterface
+{
+    /** @var ActivityExtension */
+    protected $activityExtension;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setActivityExtension(ActivityExtension $activityExtension)
+    {
+        $this->activityExtension = $activityExtension;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function up(Schema $schema, QueryBag $queries)
+    {
+        $associationTableName = $this->activityExtension->getAssociationTableName(
+            'oro_calendar_event',
+            'orocrm_magento_order'
+        );
+
+        if (!$schema->hasTable($associationTableName)) {
+            $this->activityExtension->addActivityAssociation($schema, 'oro_calendar_event', 'orocrm_magento_order');
+        }
+    }
+}

src/OroCRM/Bundle/MagentoBundle/Provider/AbstractInitialProcessor.php

@@ -5,61 +5,14 @@
 use Doctrine\ORM\EntityManager;
 
 use Oro\Bundle\IntegrationBundle\Entity\Channel as Integration;
-use Oro\Bundle\IntegrationBundle\Entity\Repository\ChannelRepository;
-use Oro\Bundle\IntegrationBundle\Entity\Status;
 use Oro\Bundle\IntegrationBundle\Provider\ConnectorInterface;
-use Oro\Bundle\IntegrationBundle\Provider\SyncProcessor;
 
-use OroCRM\Bundle\MagentoBundle\Entity\MagentoSoapTransport;
 use OroCRM\Bundle\MagentoBundle\Provider\Connector\DictionaryConnectorInterface;
 
-abstract class AbstractInitialProcessor extends SyncProcessor
+abstract class AbstractInitialProcessor extends MagentoSyncProcessor
 {
     const INITIAL_SYNC_START_DATE = 'initialSyncStartDate';
-    const INITIAL_SYNCED_TO = 'initialSyncedTo';
     const CONNECTORS_INITIAL_SYNCED_TO = 'connectorsInitialSyncedTo';
-    const START_SYNC_DATE = 'start_sync_date';
-    const SKIP_STATUS = 'skip';
-    const INTERVAL = 'initialSyncInterval';
-
-    /** @var string */
-    protected $channelClassName;
-
-    /**
-     * @param string $channelClassName
-     */
-    public function setChannelClassName($channelClassName)
-    {
-        $this->channelClassName = $channelClassName;
-    }
-
-    /**
-     * @param Integration $integration
-     * @return \DateTime
-     */
-    protected function getInitialSyncStartDate(Integration $integration)
-    {
-        if ($this->isInitialSyncStarted($integration)) {
-            /** @var MagentoSoapTransport $transport */
-            $transport = $integration->getTransport();
-
-            return $transport->getInitialSyncStartDate();
-        } else {
-            return new \DateTime('now', new \DateTimeZone('UTC'));
-        }
-    }
-
-    /**
-     * @param Integration $integration
-     * @return bool
-     */
-    protected function isInitialSyncStarted(Integration $integration)
-    {
-        /** @var MagentoSoapTransport $transport */
-        $transport = $integration->getTransport();
-
-        return (bool)$transport->getInitialSyncStartDate();
-    }
 
     /**
      * @param object $entity
@@ -72,59 +25,6 @@ protected function saveEntity($entity)
         $em->flush($entity);
     }
 
-    /**
-     * @param Integration $integration
-     * @param string $connector
-     * @return bool|\DateTime
-     */
-    protected function getSyncedTo(Integration $integration, $connector)
-    {
-        $lastStatus = $this->getLastStatusForConnector($integration, $connector, Status::STATUS_COMPLETED);
-        if ($lastStatus) {
-            $statusData = $lastStatus->getData();
-            if (!empty($statusData[self::INITIAL_SYNCED_TO])) {
-                return \DateTime::createFromFormat(
-                    \DateTime::ISO8601,
-                    $statusData[self::INITIAL_SYNCED_TO],
-                    new \DateTimeZone('UTC')
-                );
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @param Integration $integration
-     * @param string $connector
-     * @param int|null $code
-     * @return null|Status
-     */
-    protected function getLastStatusForConnector(Integration $integration, $connector, $code = null)
-    {
-        $status = $this->getChannelRepository()->getLastStatusForConnector($integration, $connector, $code);
-        if ($status) {
-            $statusData = $status->getData();
-            if (!empty($statusData[self::SKIP_STATUS])) {
-                return null;
-            }
-        }
-
-        return $status;
-    }
-
-    /**
-     * @return ChannelRepository
-     */
-    protected function getChannelRepository()
-    {
-        if (!$this->channelClassName) {
-            throw new \InvalidArgumentException('Channel class option is missing');
-        }
-
-        return $this->doctrineRegistry->getRepository($this->channelClassName);
-    }
-
     /**
      * @param Integration $integration
      */

src/OroCRM/Bundle/MagentoBundle/Provider/AbstractMagentoConnector.php

@@ -153,6 +153,11 @@ protected function initializeFromContext(ContextInterface $context)
                 $iterator->setSyncRange($interval);
             }
 
+            $incrementalInterval = $executionContext->get(InitialSyncProcessor::INCREMENTAL_INTERVAL);
+            if ($incrementalInterval) {
+                $iterator->setSyncRange($incrementalInterval);
+            }
+
             $minimalSyncDate = $executionContext->get(InitialSyncProcessor::START_SYNC_DATE);
             if ($minimalSyncDate) {
                 $iterator->setMinSyncDate($minimalSyncDate);
@@ -173,7 +178,7 @@ protected function initializeFromContext(ContextInterface $context)
     protected function getStartDate(Status $status = null)
     {
         $jobContext = $this->stepExecution->getJobExecution()->getExecutionContext();
-        $initialSyncedTo = $jobContext->get(InitialSyncProcessor::INITIAL_SYNCED_TO);
+        $initialSyncedTo = $jobContext->get(InitialSyncProcessor::SYNCED_TO);
         if ($initialSyncedTo) {
             return $initialSyncedTo;
         }