merge magento/2.2-develop into magento-performance/MAGETWO-70041

Author: Magento CICD

app/code/Magento/Config/Model/Config/Backend/Email/Address.php

@@ -23,7 +23,7 @@ class Address extends \Magento\Framework\App\Config\Value
     public function beforeSave()
     {
         $value = $this->getValue();
-        if (!\Zend_Validate::is($value, 'EmailAddress')) {
+        if (!\Zend_Validate::is($value, \Magento\Framework\Validator\EmailAddress::class)) {
             throw new LocalizedException(__('Please correct the email address: "%1".', $value));
         }
         return $this;

app/code/Magento/Customer/Controller/Account/ForgotPasswordPost.php

@@ -60,7 +60,7 @@ public function execute()
         $resultRedirect = $this->resultRedirectFactory->create();
         $email = (string)$this->getRequest()->getPost('email');
         if ($email) {
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
                 $this->session->setForgottenEmail($email);
                 $this->messageManager->addErrorMessage(__('Please correct the email address.'));
                 return $resultRedirect->setPath('*/*/forgotpassword');

app/code/Magento/Customer/Model/Metadata/Form/AbstractData.php

@@ -11,6 +11,7 @@
 namespace Magento\Customer\Model\Metadata\Form;
 
 use Magento\Framework\Api\ArrayObjectSearch;
+use Magento\Framework\Validator\EmailAddress;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -336,7 +337,7 @@ protected function _validateInputRule($value)
                     __("'%value%' appears to be a DNS hostname but cannot extract TLD part")
                     __("'%value%' appears to be a DNS hostname but cannot match TLD against known list")
                     */
-                    $validator = new \Zend_Validate_EmailAddress();
+                    $validator = new EmailAddress();
                     $validator->setMessage(
                         __('"%1" invalid type entered.', $label),
                         \Zend_Validate_EmailAddress::INVALID
@@ -377,10 +378,6 @@ protected function _validateInputRule($value)
                         __("'%value%' looks like an IP address, which is not an acceptable format."),
                         \Zend_Validate_Hostname::IP_ADDRESS_NOT_ALLOWED
                     );
-                    $validator->setMessage(
-                        __("'%value%' looks like a DNS hostname but we cannot match the TLD against known list."),
-                        \Zend_Validate_Hostname::UNKNOWN_TLD
-                    );
                     $validator->setMessage(
                         __("'%value%' looks like a DNS hostname but contains a dash in an invalid position."),
                         \Zend_Validate_Hostname::INVALID_DASH

app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php

@@ -235,7 +235,7 @@ protected function _checkUniqueKey(array $rowData, $rowNumber)
             $email = strtolower($rowData[static::COLUMN_EMAIL]);
             $website = $rowData[static::COLUMN_WEBSITE];
 
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
                 $this->addRowError(static::ERROR_INVALID_EMAIL, $rowNumber, static::COLUMN_EMAIL);
             } elseif (!isset($this->_websiteCodeToId[$website])) {
                 $this->addRowError(static::ERROR_INVALID_WEBSITE, $rowNumber, static::COLUMN_WEBSITE);

app/code/Magento/Eav/Model/Attribute/Data/AbstractData.php

@@ -10,6 +10,7 @@
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\LocalizedException as CoreException;
+use Magento\Framework\Validator\EmailAddress;
 
 /**
  * EAV Attribute Abstract Data Model
@@ -365,7 +366,7 @@ protected function _validateInputRule($value)
                     __("'%value%' appears to be a DNS hostname but cannot extract TLD part")
                     __("'%value%' appears to be a DNS hostname but cannot match TLD against known list")
                     */
-                    $validator = new \Zend_Validate_EmailAddress();
+                    $validator = new EmailAddress();
                     $validator->setMessage(
                         __('"%1" invalid type entered.', $label),
                         \Zend_Validate_EmailAddress::INVALID
@@ -406,10 +407,6 @@ protected function _validateInputRule($value)
                         __("'%value%' looks like an IP address, which is not an acceptable format."),
                         \Zend_Validate_Hostname::IP_ADDRESS_NOT_ALLOWED
                     );
-                    $validator->setMessage(
-                        __("'%value%' looks like a DNS hostname but we cannot match the TLD against known list."),
-                        \Zend_Validate_Hostname::UNKNOWN_TLD
-                    );
                     $validator->setMessage(
                         __("'%value%' looks like a DNS hostname but contains a dash in an invalid position."),
                         \Zend_Validate_Hostname::INVALID_DASH

app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

@@ -103,7 +103,7 @@ protected function validateGuestSubscription()
      */
     protected function validateEmailFormat($email)
     {
-        if (!\Zend_Validate::is($email, 'EmailAddress')) {
+        if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
             throw new \Magento\Framework\Exception\LocalizedException(__('Please enter a valid email address.'));
         }
     }

app/code/Magento/Quote/Model/Quote/Address/Validator.php

@@ -39,7 +39,7 @@ public function isValid($value)
     {
         $messages = [];
         $email = $value->getEmail();
-        if (!empty($email) && !\Zend_Validate::is($email, 'EmailAddress')) {
+        if (!empty($email) && !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
             $messages['invalid_email_format'] = 'Invalid email format';
         }
 

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -49,6 +49,12 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
             $model->getBaseRowTotal()
         );
 
+        $attrCode = $this->getAttribute();
+
+        if ('category_ids' == $attrCode) {
+            return $this->validateAttribute($this->_getAvailableInCategories($product->getId()));
+        }
+
         return parent::validate($product);
     }
 

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\Rule\Condition;
 
+use \Magento\Framework\DB\Adapter\AdapterInterface;
+use \Magento\Framework\DB\Select;
+use \Magento\Framework\Model\AbstractModel;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
 use \Magento\Rule\Model\Condition\Context;
 use \Magento\Backend\Helper\Data;
 use \Magento\Eav\Model\Config;
@@ -52,6 +56,12 @@ class ProductTest extends \PHPUnit_Framework_TestCase
     /** @var AttributeLoaderInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $attributeLoaderInterfaceMock;
 
+    /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $adapterInterfaceMock;
+
+    /** @var Select|\PHPUnit_Framework_MockObject_MockObject */
+    protected $selectMock;
+
     /**
      * Setup the test
      */
@@ -78,15 +88,45 @@ protected function setUp()
         $this->attributeLoaderInterfaceMock
             ->expects($this->any())
             ->method('getAttributesByCode')
-            ->will($this->returnValue([]));
+            ->willReturn([]);
+        $this->selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['distinct', 'from', 'where'])
+            ->getMock();
+        $this->selectMock
+            ->expects($this->any())
+            ->method('distinct')
+            ->willReturnSelf();
+        $this->selectMock
+            ->expects($this->any())
+            ->method('from')
+            ->with($this->anything(), $this->anything())
+            ->willReturnSelf();
+        $this->adapterInterfaceMock = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['fetchCol', 'select'])
+            ->getMockForAbstractClass();
+        $this->adapterInterfaceMock
+            ->expects($this->any())
+            ->method('select')
+            ->willReturn($this->selectMock);
         $this->productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
-            ->setMethods(['loadAllAttributes'])
+            ->setMethods(['loadAllAttributes', 'getConnection', 'getTable'])
             ->getMock();
         $this->productMock
             ->expects($this->any())
             ->method('loadAllAttributes')
-            ->will($this->returnValue($this->attributeLoaderInterfaceMock));
+            ->willReturn($this->attributeLoaderInterfaceMock);
+        $this->productMock
+            ->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->adapterInterfaceMock);
+        $this->productMock
+            ->expects($this->any())
+            ->method('getTable')
+            ->with($this->anything())
+            ->willReturn('table_name');
         $this->collectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -158,4 +198,37 @@ public function testGetValueElementChooserUrl($attribute, $url, $jsObject = '')
 
         $this->assertEquals($url, $this->model->getValueElementChooserUrl());
     }
+
+    public function testValidateCategoriesIgnoresVisibility()
+    {
+        /* @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject $product */
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAttribute', 'getId', 'setQuoteItemQty', 'setQuoteItemPrice'])
+            ->getMock();
+        $product
+            ->expects($this->any())
+            ->method('setQuoteItemQty')
+            ->willReturnSelf();
+        $product
+            ->expects($this->any())
+            ->method('setQuoteItemPrice')
+            ->willReturnSelf();
+        /* @var AbstractItem|\PHPUnit_Framework_MockObject_MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($product);
+        $this->model->setAttribute('category_ids');
+
+        $this->selectMock
+            ->expects($this->once())
+            ->method('where')
+            ->with($this->logicalNot($this->stringContains('visibility')), $this->anything(), $this->anything());
+
+        $this->model->validate($item);
+    }
 }

app/code/Magento/SendFriend/Model/SendFriend.php

@@ -237,7 +237,7 @@ public function validate()
         }
 
         $email = $this->getSender()->getEmail();
-        if (empty($email) or !\Zend_Validate::is($email, 'EmailAddress')) {
+        if (empty($email) or !\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
             $errors[] = __('Invalid Sender Email');
         }
 
@@ -252,7 +252,7 @@ public function validate()
 
         // validate recipients email addresses
         foreach ($this->getRecipients()->getEmails() as $email) {
-            if (!\Zend_Validate::is($email, 'EmailAddress')) {
+            if (!\Zend_Validate::is($email, \Magento\Framework\Validator\EmailAddress::class)) {
                 $errors[] = __('Please enter a correct recipient email address.');
                 break;
             }