🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #12105: #11936:required attribute set id filter on attribute group repository getList (by @tzyganu)
 - #12751: #12439 Newsletter subscription success email not sent… (by @Styopchik)
 - #12737: #11953: Product configuration creator does not warn about invalid SKUs (by @zamoroka)
 - magento-engcom/magento2ce#1016: #11743: [GitHub] AbstractPdf - ZendException font is not set (by @serhii-balko)
 - #12636: #12625: Add Current Date to update_time Field for Block and Pages (by @osrecio)
 - #11686:  Fix error when generating urn catalog for empty misc.xml (by @tdgroot)
 - #11878: [BUGFIX] Made method public so a plugin is possible. (by @dheesbeen)
 - #11462: #7241: Always add empty option for prefix and/or suffix if optional (by @avstudnitz)


Fixed GitHub Issues:
 - #11936: required attribute set id filter on attribute group repository getList (reported by @tzyganu) has been fixed in #12105 by @tzyganu in 2.2-develop branch
   Related commits:
     1. 433c3cd
     2. 7be92a8

 - #12439: Newsletter subscription success email not sent after confirmation (reported by @nfourteen) has been fixed in #12751 by @Styopchik in 2.2-develop branch
   Related commits:
     1. c4e4168

 - #11953: Product configuration creator does not warn about invalid SKUs (reported by @JanisE) has been fixed in #12737 by @zamoroka in 2.2-develop branch
   Related commits:
     1. 5cf0d34
     2. 7418f1a

 - #11743: AbstractPdf - ZendException font is not set (reported by @jchenevey) has been fixed in magento-engcom/magento2ce#1016 by @serhii-balko in 2.2-develop branch
   Related commits:
     1. 2629726
     2. b326714
     3. 5f4363b
     4. 9ce4730

 - #12625: when saving a page in magento 2.2.1, 'Modified' date field is not getting updated (reported by @mahmood537) has been fixed in #12636 by @osrecio in 2.2-develop branch
   Related commits:
     1. 22f454d

 - #5188: Error generating URN-catalog when blank one exists (reported by @JamesonNetworks) has been fixed in #11686 by @tdgroot in 2.2-develop branch
   Related commits:
     1. 177e540
     2. 0d65213
     3. a781bf6
     4. dcc480d
     5. 5d4e1c2
     6. b552dd1
     7. b85b91e

 - #7241: No option to start with blank option for prefix and suffix in checkout. (reported by @spyrule) has been fixed in #11462 by @avstudnitz in 2.2-develop branch
   Related commits:
     1. 11e38f6
     2. 7800e5d
     3. 252529f
     4. 519b805
     5. eb79b38
     6. fce3afe
     7. 3e38118

Author: Oleksii Korshenko

app/code/Magento/Cms/Model/Block.php

@@ -6,7 +6,6 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data\BlockInterface;
-use Magento\Cms\Model\ResourceModel\Block as ResourceCmsBlock;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Model\AbstractModel;
 
@@ -58,6 +57,11 @@ protected function _construct()
     public function beforeSave()
     {
         $needle = 'block_id="' . $this->getId() . '"';
+
+        if ($this->hasDataChanges()) {
+            $this->setUpdateTime(null);
+        }
+
         if (false == strstr($this->getContent(), $needle)) {
             return parent::beforeSave();
         }

app/code/Magento/Cms/Model/Page.php

@@ -6,12 +6,11 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data\PageInterface;
-use Magento\Cms\Model\ResourceModel\Page as ResourceCmsPage;
+use Magento\Cms\Helper\Page as PageHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Cms\Helper\Page as PageHelper;
 
 /**
  * Cms Page Model
@@ -547,6 +546,10 @@ public function beforeSave()
         $originalIdentifier = $this->getOrigData('identifier');
         $currentIdentifier = $this->getIdentifier();
 
+        if ($this->hasDataChanges()) {
+            $this->setUpdateTime(null);
+        }
+
         if (!$this->getId() || $originalIdentifier === $currentIdentifier) {
             return parent::beforeSave();
         }

app/code/Magento/Cms/Model/ResourceModel/Block.php

@@ -7,10 +7,10 @@
 
 use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Store\Model\Store;

app/code/Magento/Cms/Model/ResourceModel/Page.php

@@ -6,18 +6,18 @@
 
 namespace Magento\Cms\Model\ResourceModel;
 
+use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Model\Page as CmsPage;
 use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\EntityManager\EntityManager;
-use Magento\Cms\Api\Data\PageInterface;
 
 /**
  * Cms page mysql resource

app/code/Magento/Config/Model/Config/Source/Nooptreq.php

@@ -11,15 +11,19 @@
  */
 class Nooptreq implements \Magento\Framework\Option\ArrayInterface
 {
+    const VALUE_NO = '';
+    const VALUE_OPTIONAL = 'opt';
+    const VALUE_REQUIRED = 'req';
+
     /**
      * @return array
      */
     public function toOptionArray()
     {
         return [
-            ['value' => '', 'label' => __('No')],
-            ['value' => 'opt', 'label' => __('Optional')],
-            ['value' => 'req', 'label' => __('Required')]
+            ['value' => self::VALUE_NO, 'label' => __('No')],
+            ['value' => self::VALUE_OPTIONAL, 'label' => __('Optional')],
+            ['value' => self::VALUE_REQUIRED, 'label' => __('Required')]
         ];
     }
 }

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\Form;
@@ -466,7 +467,17 @@ protected function getRows()
                         [],
                         ['dataScope' => 'product_link']
                     ),
-                    'sku_container' => $this->getColumn('sku', __('SKU')),
+                    'sku_container' => $this->getColumn(
+                        'sku',
+                        __('SKU'),
+                        [
+                            'validation' =>
+                                [
+                                    'required-entry' => true,
+                                    'max_text_length' => Sku::SKU_MAX_LENGTH,
+                                ]
+                        ]
+                    ),
                     'price_container' => $this->getColumn(
                         'price',
                         __('Price'),

app/code/Magento/Customer/Block/Widget/Name.php

@@ -106,8 +106,11 @@ public function getPrefixOptions()
         $prefixOptions = $this->options->getNamePrefixOptions();
 
         if ($this->getObject() && !empty($prefixOptions)) {
-            $oldPrefix = $this->escapeHtml(trim($this->getObject()->getPrefix()));
-            $prefixOptions[$oldPrefix] = $oldPrefix;
+            $prefixOption = $this->getObject()->getPrefix();
+            $oldPrefix = $this->escapeHtml(trim($prefixOption));
+            if ($prefixOption !== null && !isset($prefixOptions[$oldPrefix]) && !isset($prefixOptions[$prefixOption])) {
+                $prefixOptions[$oldPrefix] = $oldPrefix;
+            }
         }
         return $prefixOptions;
     }
@@ -161,8 +164,11 @@ public function getSuffixOptions()
     {
         $suffixOptions = $this->options->getNameSuffixOptions();
         if ($this->getObject() && !empty($suffixOptions)) {
-            $oldSuffix = $this->escapeHtml(trim($this->getObject()->getSuffix()));
-            $suffixOptions[$oldSuffix] = $oldSuffix;
+            $suffixOption = $this->getObject()->getSuffix();
+            $oldSuffix = $this->escapeHtml(trim($suffixOption));
+            if ($suffixOption !== null && !isset($suffixOptions[$oldSuffix]) && !isset($suffixOptions[$suffixOption])) {
+                $suffixOptions[$oldSuffix] = $oldSuffix;
+            }
         }
         return $suffixOptions;
     }

app/code/Magento/Customer/Model/AccountConfirmation.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Customer\Model;
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Registry;
+
+/**
+ * Class AccountConfirmation.
+ * Checks if email confirmation required for customer.
+ */
+class AccountConfirmation
+{
+    /**
+     * Configuration path for email confirmation.
+     */
+    const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Registry $registry
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Registry $registry
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->registry = $registry;
+    }
+
+    /**
+     * Check if accounts confirmation is required.
+     *
+     * @param int|null $websiteId
+     * @param int|null $customerId
+     * @param string $customerEmail
+     * @return bool
+     */
+    public function isConfirmationRequired($websiteId, $customerId, $customerEmail): bool
+    {
+        if ($this->canSkipConfirmation($customerId, $customerEmail)) {
+            return false;
+        }
+
+        return (bool)$this->scopeConfig->getValue(
+            self::XML_PATH_IS_CONFIRM,
+            ScopeInterface::SCOPE_WEBSITES,
+            $websiteId
+        );
+    }
+
+    /**
+     * Check whether confirmation may be skipped when registering using certain email address.
+     *
+     * @param int|null $customerId
+     * @param string $customerEmail
+     * @return bool
+     */
+    private function canSkipConfirmation($customerId, $customerEmail): bool
+    {
+        if (!$customerId) {
+            return false;
+        }
+
+        /* If an email was used to start the registration process and it is the same email as the one
+           used to register, then this can skip confirmation.
+           */
+        $skipConfirmationIfEmail = $this->registry->registry("skip_confirmation_if_email");
+        if (!$skipConfirmationIfEmail) {
+            return false;
+        }
+
+        return strtolower($skipConfirmationIfEmail) === strtolower($customerEmail);
+    }
+}

app/code/Magento/Customer/Model/AccountManagement.php

@@ -89,6 +89,10 @@ class AccountManagement implements AccountManagementInterface
      */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'customer/password/forgot_email_identity';
 
+    /**
+     * @deprecated
+     * @see AccountConfirmation::XML_PATH_IS_CONFIRM
+     */
     const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
 
     /**
@@ -298,6 +302,11 @@ class AccountManagement implements AccountManagementInterface
      */
     private $dateTimeFactory;
 
+    /**
+     * @var AccountConfirmation
+     */
+    private $accountConfirmation;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param ManagerInterface $eventManager
@@ -323,7 +332,8 @@ class AccountManagement implements AccountManagementInterface
      * @param ObjectFactory $objectFactory
      * @param ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @param CredentialsValidator|null $credentialsValidator
-     * @param DateTimeFactory $dateTimeFactory
+     * @param DateTimeFactory|null $dateTimeFactory
+     * @param AccountConfirmation|null $accountConfirmation
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -351,7 +361,8 @@ public function __construct(
         ObjectFactory $objectFactory,
         ExtensibleDataObjectConverter $extensibleDataObjectConverter,
         CredentialsValidator $credentialsValidator = null,
-        DateTimeFactory $dateTimeFactory = null
+        DateTimeFactory $dateTimeFactory = null,
+        AccountConfirmation $accountConfirmation = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -379,6 +390,8 @@ public function __construct(
         $this->credentialsValidator =
             $credentialsValidator ?: ObjectManager::getInstance()->get(CredentialsValidator::class);
         $this->dateTimeFactory = $dateTimeFactory ?: ObjectManager::getInstance()->get(DateTimeFactory::class);
+        $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
+            ->get(AccountConfirmation::class);
     }
 
     /**
@@ -1149,17 +1162,15 @@ protected function sendEmailTemplate(
      *
      * @param CustomerInterface $customer
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     protected function isConfirmationRequired($customer)
     {
-        if ($this->canSkipConfirmation($customer)) {
-            return false;
-        }
-
-        return (bool)$this->scopeConfig->getValue(
-            self::XML_PATH_IS_CONFIRM,
-            ScopeInterface::SCOPE_WEBSITES,
-            $customer->getWebsiteId()
+        return $this->accountConfirmation->isConfirmationRequired(
+            $customer->getWebsiteId(),
+            $customer->getId(),
+            $customer->getEmail()
         );
     }
 
@@ -1168,6 +1179,8 @@ protected function isConfirmationRequired($customer)
      *
      * @param CustomerInterface $customer
      * @return bool
+     * @deprecated
+     * @see AccountConfirmation::isConfirmationRequired
      */
     protected function canSkipConfirmation($customer)
     {