Merged PR 6420: Merge release/245 to master

Related work items: #56353, #65759, #65786, #65795, #65798, #65802, #65819, #65828, #65921, #65950, #65956, #65980, #66028, #66073, #66097, #66202, #66277
dotmailer · Mar 1, 2018 · da42683 · da42683
2 parents 4f299aa + fe99ab9
commit da42683
Show file tree

Hide file tree

Showing 176 changed files with 1,462 additions and 1,169 deletions.
diff --git a/Block/Adminhtml/Config/Automation/Customdatafields.php b/Block/Adminhtml/Config/Automation/Customdatafields.php
@@ -28,15 +28,15 @@ class Customdatafields extends
     /**
      * Customdatafields constructor.
      *
-     * @param \Magento\Framework\Data\Form\Element\Factory                         $elementFactory
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param \Dotdigitalgroup\Email\Model\Config\Source\Automation\ProgramFactory $programFactory
-     * @param \Magento\Backend\Block\Template\Context                              $context
-     * @param array                                                                $data
+     * @param array $data
      */
     public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Data\Form\Element\Factory $elementFactory,
         \Dotdigitalgroup\Email\Model\Config\Source\Automation\ProgramFactory $programFactory,
-        \Magento\Backend\Block\Template\Context $context,
         array $data = []
     ) {
         $this->elementFactory = $elementFactory;

diff --git a/Block/Adminhtml/Config/Automation/Feefo/Reviews.php b/Block/Adminhtml/Config/Automation/Feefo/Reviews.php
@@ -12,12 +12,12 @@ class Reviews extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Reviews constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $data
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $data
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $data,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $data
     ) {
         $this->helper = $data;
 

diff --git a/Block/Adminhtml/Config/Automation/Feefo/Score.php b/Block/Adminhtml/Config/Automation/Feefo/Score.php
@@ -12,12 +12,12 @@ class Score extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Score constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $data
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $data
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $data,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $data
     ) {
         $this->helper = $data;
 

diff --git a/Block/Adminhtml/Config/Customdatafields.php b/Block/Adminhtml/Config/Customdatafields.php
@@ -42,15 +42,15 @@ class Customdatafields extends
     /**
      * Customdatafields constructor.
      *
-     * @param \Magento\Framework\Data\Form\Element\Factory                             $elementFactory
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param \Dotdigitalgroup\Email\Model\Config\Source\Datamapping\DatafieldsFactory $datafields
-     * @param \Magento\Backend\Block\Template\Context                                  $context
-     * @param array                                                                    $data
+     * @param array $data
      */
     public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Data\Form\Element\Factory $elementFactory,
         \Dotdigitalgroup\Email\Model\Config\Source\Datamapping\DatafieldsFactory $datafields,
-        \Magento\Backend\Block\Template\Context $context,
         array $data = []
     ) {
         $this->elementFactory    = $elementFactory;

diff --git a/Block/Adminhtml/Config/Developer/Connect.php b/Block/Adminhtml/Config/Developer/Connect.php
@@ -33,17 +33,17 @@ class Connect extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Connect constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $helper
-     * @param \Dotdigitalgroup\Email\Helper\Config    $configHelper
-     * @param \Magento\Backend\Model\Auth             $auth
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param array                                   $data
+     * @param \Dotdigitalgroup\Email\Helper\Data $helper
+     * @param \Dotdigitalgroup\Email\Helper\Config $configHelper
+     * @param \Magento\Backend\Model\Auth $auth
+     * @param array $data
      */
     public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
         \Dotdigitalgroup\Email\Helper\Data $helper,
         \Dotdigitalgroup\Email\Helper\Config $configHelper,
         \Magento\Backend\Model\Auth $auth,
-        \Magento\Backend\Block\Template\Context $context,
         $data = []
     ) {
         $this->helper       = $helper;

diff --git a/Block/Adminhtml/Config/Developer/EmailTemplatesSync.php b/Block/Adminhtml/Config/Developer/EmailTemplatesSync.php
@@ -30,7 +30,7 @@ public function setButtonLabel($buttonLabel)
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         $url = $this->_urlBuilder->getUrl('dotdigitalgroup_email/run/templatesync');
 

diff --git a/Block/Adminhtml/Config/Developer/Templatesync.php b/Block/Adminhtml/Config/Developer/Templatesync.php
@@ -30,7 +30,7 @@ public function setButtonLabel($buttonLabel)
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         $url = $this->_urlBuilder->getUrl('dotdigitalgroup_email/run/templatesync');
 

diff --git a/Block/Adminhtml/Config/Dynamic/Abandoned.php b/Block/Adminhtml/Config/Dynamic/Abandoned.php
@@ -13,12 +13,12 @@ class Abandoned extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Abandoned constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Bestsellers.php b/Block/Adminhtml/Config/Dynamic/Bestsellers.php
@@ -13,12 +13,12 @@ class Bestsellers extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Bestsellers constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Cart/Crosssell.php b/Block/Adminhtml/Config/Dynamic/Cart/Crosssell.php
@@ -13,12 +13,12 @@ class Crosssell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Crosssell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Cart/Related.php b/Block/Adminhtml/Config/Dynamic/Cart/Related.php
@@ -13,12 +13,12 @@ class Related extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Related constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Cart/Upsell.php b/Block/Adminhtml/Config/Dynamic/Cart/Upsell.php
@@ -13,12 +13,12 @@ class Upsell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Upsell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Couponcode.php b/Block/Adminhtml/Config/Dynamic/Couponcode.php
@@ -13,12 +13,12 @@ class Couponcode extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Couponcode constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Crosssell.php b/Block/Adminhtml/Config/Dynamic/Crosssell.php
@@ -13,12 +13,12 @@ class Crosssell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Crosssell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Mostviewed.php b/Block/Adminhtml/Config/Dynamic/Mostviewed.php
@@ -13,12 +13,12 @@ class Mostviewed extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Mostviewed constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Productpush.php b/Block/Adminhtml/Config/Dynamic/Productpush.php
@@ -13,12 +13,12 @@ class Productpush extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Productpush constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Recentlyviewed.php b/Block/Adminhtml/Config/Dynamic/Recentlyviewed.php
@@ -13,12 +13,12 @@ class Recentlyviewed extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Recentlyviewed constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Related.php b/Block/Adminhtml/Config/Dynamic/Related.php
@@ -13,12 +13,12 @@ class Related extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Related constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Review.php b/Block/Adminhtml/Config/Dynamic/Review.php
@@ -13,12 +13,12 @@ class Review extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Review constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data      $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Upsell.php b/Block/Adminhtml/Config/Dynamic/Upsell.php
@@ -13,12 +13,12 @@ class Upsell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Upsell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Wishlist/Content.php b/Block/Adminhtml/Config/Dynamic/Wishlist/Content.php
@@ -13,12 +13,12 @@ class Content extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Content constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Wishlist/Crosssell.php b/Block/Adminhtml/Config/Dynamic/Wishlist/Crosssell.php
@@ -13,12 +13,12 @@ class Crosssell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Crosssell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Wishlist/Related.php b/Block/Adminhtml/Config/Dynamic/Wishlist/Related.php
@@ -13,12 +13,12 @@ class Related extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Related constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;
 

diff --git a/Block/Adminhtml/Config/Dynamic/Wishlist/Upsell.php b/Block/Adminhtml/Config/Dynamic/Wishlist/Upsell.php
@@ -13,12 +13,12 @@ class Upsell extends \Magento\Config\Block\System\Config\Form\Field
     /**
      * Upsell constructor.
      *
-     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Dotdigitalgroup\Email\Helper\Data $dataHelper
      */
     public function __construct(
-        \Dotdigitalgroup\Email\Helper\Data $dataHelper,
-        \Magento\Backend\Block\Template\Context $context
+        \Magento\Backend\Block\Template\Context $context,
+        \Dotdigitalgroup\Email\Helper\Data $dataHelper
     ) {
         $this->dataHelper = $dataHelper;