Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-70669-PR-7711

Author: ishakhsuvarov

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

app/bootstrap.php

@@ -63,5 +63,5 @@
 date_default_timezone_set('UTC');
 
 /*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+ini_set('precision', 15);
+ini_set('serialize_precision', 15);

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -21,9 +21,12 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
     \Magento\Framework\DataObject\IdentityInterface
 {
     /**
-     * Attribute code max length
+     * Attribute code max length.
+     *
+     * The value is defined as 60 because in the flat mode attribute code will be transformed into column name.
+     * MySQL allows only 64 symbols in column name.
      */
-    const ATTRIBUTE_CODE_MAX_LENGTH = 255;
+    const ATTRIBUTE_CODE_MAX_LENGTH = 60;
 
     /**
      * Cache tag

app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php

@@ -190,7 +190,8 @@ private function getAclResources()
         $configResource = array_filter(
             $resources,
             function ($node) {
-                return $node['id'] == 'Magento_Backend::admin';
+                return isset($node['id'])
+                    && $node['id'] == 'Magento_Backend::admin';
             }
         );
         $configResource = reset($configResource);

app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php

@@ -3,24 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\ProductAlert\Block\Email;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\ProductAlert\Block\Product\ImageProvider;
 
 /**
  * Product Alert Abstract Email Block
- *
- * @author     Magento Core Team <[email protected]>
  */
 abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
 {
     /**
      * Product collection array
      *
-     * @var array
+     * @var \Magento\Catalog\Model\Product[]
      */
     protected $_products = [];
 
@@ -42,36 +39,45 @@ abstract class AbstractEmail extends \Magento\Framework\View\Element\Template
     protected $priceCurrency;
 
     /**
-     * @var \Magento\Catalog\Helper\Image
+     * @var \Magento\Catalog\Block\Product\ImageBuilder
      */
     protected $imageBuilder;
 
+    /**
+     * @var ImageProvider
+     */
+    private $imageProvider;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder
      * @param array $data
+     * @param ImageProvider $imageProvider
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Filter\Input\MaliciousCode $maliciousCode,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder,
-        array $data = []
+        array $data = [],
+        ImageProvider $imageProvider = null
     ) {
         $this->imageBuilder = $imageBuilder;
         $this->priceCurrency = $priceCurrency;
         $this->_maliciousCode = $maliciousCode;
+        $this->imageProvider = $imageProvider ?: ObjectManager::getInstance()->get(ImageProvider::class);
+
         parent::__construct($context, $data);
     }
 
     /**
-    * Filter malicious code before insert content to email
-    *
-    * @param  string|array $content
-    * @return string|array
-    */
+     * Filter malicious code before insert content to email
+     *
+     * @param string|array $content
+     * @return string|array
+     */
     public function getFilteredContent($content)
     {
         return $this->_maliciousCode->filter($content);
@@ -104,7 +110,7 @@ public function setStore($store)
      */
     public function getStore()
     {
-        if (is_null($this->_store)) {
+        if ($this->_store === null) {
             $this->_store = $this->_storeManager->getStore();
         }
         return $this->_store;
@@ -114,9 +120,9 @@ public function getStore()
      * Convert price from default currency to current currency
      *
      * @param float $price
-     * @param boolean $format             Format price to currency format
-     * @param boolean $includeContainer   Enclose into <span class="price"><span>
-     * @return float
+     * @param bool $format Format price to currency format
+     * @param bool $includeContainer Enclose into <span class="price"><span>
+     * @return float|string
      */
     public function formatPrice($price, $format = true, $includeContainer = true)
     {
@@ -149,7 +155,7 @@ public function addProduct(\Magento\Catalog\Model\Product $product)
     /**
      * Retrieve product collection array
      *
-     * @return array
+     * @return \Magento\Catalog\Model\Product[]
      */
     public function getProducts()
     {
@@ -212,7 +218,7 @@ public function getProductPriceHtml(
     }
 
     /**
-     * Retrieve product image
+     * Retrieve product image.
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param string $imageId
@@ -221,9 +227,6 @@ public function getProductPriceHtml(
      */
     public function getImage($product, $imageId, $attributes = [])
     {
-        return $this->imageBuilder->setProduct($product)
-            ->setImageId($imageId)
-            ->setAttributes($attributes)
-            ->create();
+        return $this->imageProvider->getImage($product, $imageId, $attributes);
     }
 }

app/code/Magento/ProductAlert/Block/Product/ImageProvider.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ProductAlert\Block\Product;
+
+use Magento\Store\Model\App\Emulation;
+use Magento\Catalog\Block\Product\ImageBuilder;
+use Magento\Catalog\Model\Product;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\Area;
+use Magento\Catalog\Block\Product\Image;
+
+/**
+ * Provides product image to be used in the Product Alert Email.
+ */
+class ImageProvider
+{
+    /**
+     * @var ImageBuilder
+     */
+    private $imageBuilder;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Emulation
+     */
+    private $appEmulation;
+
+    /**
+     * @param ImageBuilder $imageBuilder
+     * @param StoreManagerInterface $storeManager
+     * @param Emulation $appEmulation
+     */
+    public function __construct(
+        ImageBuilder $imageBuilder,
+        StoreManagerInterface $storeManager,
+        Emulation $appEmulation
+    ) {
+        $this->imageBuilder = $imageBuilder;
+        $this->storeManager = $storeManager;
+        $this->appEmulation = $appEmulation;
+    }
+
+    /**
+     * @param Product $product
+     * @param string $imageId
+     * @param array $attributes
+     * @return Image
+     * @throws \Exception
+     */
+    public function getImage(Product $product, $imageId, $attributes = [])
+    {
+        $storeId = $this->storeManager->getStore()->getId();
+        $this->appEmulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
+
+        try {
+            $image = $this->imageBuilder->setProduct($product)
+                ->setImageId($imageId)
+                ->setAttributes($attributes)
+                ->create();
+        } catch (\Exception $exception) {
+            $this->appEmulation->stopEnvironmentEmulation();
+            throw $exception;
+        }
+
+        $this->appEmulation->stopEnvironmentEmulation();
+        return $image;
+    }
+}

app/code/Magento/ProductAlert/Test/Unit/Block/Email/StockTest.php

@@ -25,6 +25,11 @@ class StockTest extends \PHPUnit_Framework_TestCase
      */
     protected $imageBuilder;
 
+    /**
+     * @var \Magento\ProductAlert\Block\Product\ImageProvider|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $imageProviderMock;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -40,11 +45,16 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->imageProviderMock = $this->getMockBuilder(\Magento\ProductAlert\Block\Product\ImageProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->_block = $objectManager->getObject(
             \Magento\ProductAlert\Block\Email\Stock::class,
             [
                 'maliciousCode' => $this->_filter,
                 'imageBuilder' => $this->imageBuilder,
+                'imageProvider' => $this->imageProviderMock
             ]
         );
     }
@@ -77,26 +87,11 @@ public function testGetImage()
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $imageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
+        $productImageMock = $this->getMockBuilder(\Magento\Catalog\Block\Product\Image::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imageBuilder->expects($this->once())
-            ->method('setProduct')
-            ->with($productMock)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setImageId')
-            ->with($imageId)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('setAttributes')
-            ->with($attributes)
-            ->willReturnSelf();
-        $this->imageBuilder->expects($this->once())
-            ->method('create')
-            ->willReturn($imageMock);
+        $this->imageProviderMock->expects($this->atLeastOnce())->method('getImage')->willReturn($productImageMock);
 
         $this->assertInstanceOf(
             \Magento\Catalog\Block\Product\Image::class,