Merge remote-tracking branch 'mainline/develop' into exception_logger

Author: Serhiy Shkolyarenko

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Product;
 
+use Magento\Framework\DB\Query\BatchIteratorInterface as BatchIteratorInterface;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 
@@ -102,20 +104,29 @@ abstract class AbstractAction
      */
     protected $tempTreeIndexTableName;
 
+    /**
+     * @var QueryGenerator
+     */
+    private $queryGenerator;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
+     * @param QueryGenerator $queryGenerator
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Config $config
+        \Magento\Catalog\Model\Config $config,
+        QueryGenerator $queryGenerator = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->storeManager = $storeManager;
         $this->config = $config;
+        $this->queryGenerator = $queryGenerator ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(QueryGenerator::class);
     }
 
     /**
@@ -309,15 +320,26 @@ protected function isRangingNeeded()
      * @param int $range
      * @return \Magento\Framework\DB\Select[]
      */
-    protected function prepareSelectsByRange(\Magento\Framework\DB\Select $select, $field, $range = self::RANGE_CATEGORY_STEP)
-    {
-        return $this->isRangingNeeded() ? $this->connection->selectsByRange(
-            $field,
-            $select,
-            $range
-        ) : [
-            $select
-        ];
+    protected function prepareSelectsByRange(
+        \Magento\Framework\DB\Select $select,
+        $field,
+        $range = self::RANGE_CATEGORY_STEP
+    ) {
+        if($this->isRangingNeeded()) {
+            $iterator = $this->queryGenerator->generate(
+                $field,
+                $select,
+                $range,
+                \Magento\Framework\DB\Query\BatchIteratorInterface::NON_UNIQUE_FIELD_ITERATOR
+            );
+
+            $queries = [];
+            foreach ($iterator as $query) {
+                $queries[] = $query;
+            }
+            return $queries;
+        }
+        return [$select];
     }
 
     /**

app/code/Magento/Catalog/etc/eav_attributes.xml

@@ -30,6 +30,7 @@
             <field code="is_searchable" locked="true" />
         </attribute>
         <attribute code="category_ids">
+            <field code="is_global" locked="true" />
             <field code="is_searchable" locked="true" />
             <field code="used_for_sort_by" locked="true" />
             <field code="is_used_in_grid" locked="true" />

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Void.php renamed to app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/VoidAction.php

@@ -7,7 +7,7 @@
 
 use Magento\Backend\App\Action;
 
-class Void extends \Magento\Backend\App\Action
+class VoidAction extends Action
 {
     /**
      * Authorization level of a basic admin session

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php renamed to app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidAction.php

@@ -6,7 +6,7 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-class Void extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
+class VoidAction extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
     /**
      * Void invoice action

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidTest.php renamed to app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/VoidActionTest.php

@@ -6,11 +6,11 @@
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Creditmemo;
 
 /**
- * Class VoidTest
+ * Class VoidActionTest
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VoidTest extends \PHPUnit_Framework_TestCase
+class VoidActionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\AddComment
@@ -179,7 +179,7 @@ protected function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->controller = $objectManager->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\Void::class,
+            \Magento\Sales\Controller\Adminhtml\Order\Creditmemo\VoidAction::class,
             [
                 'context' => $this->contextMock,
                 'creditmemoLoader' => $this->loaderMock,

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidTest.php renamed to app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/VoidActionTest.php

@@ -10,11 +10,11 @@
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 
 /**
- * Class VoidTest
+ * Class VoidActionTest
  * @package Magento\Sales\Controller\Adminhtml\Order\Invoice
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class VoidTest extends \PHPUnit_Framework_TestCase
+class VoidActionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -166,7 +166,7 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->controller = $objectManager->getObject(
-            \Magento\Sales\Controller\Adminhtml\Order\Invoice\Void::class,
+            \Magento\Sales\Controller\Adminhtml\Order\Invoice\VoidAction::class,
             [
                 'context' => $contextMock,
                 'resultForwardFactory' => $this->resultForwardFactoryMock

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -165,11 +165,19 @@ public function setValidationFilter(
                     \Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON
                 );
 
-                $orWhereConditions = [
+                $autoGeneratedCouponCondition = [
                     $connection->quoteInto(
-                        '(main_table.coupon_type = ? AND rule_coupons.type = 0)',
+                        "main_table.coupon_type = ?",
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
                     ),
+                    $connection->quoteInto(
+                        "rule_coupons.type = ?",
+                        \Magento\SalesRule\Api\Data\CouponInterface::TYPE_GENERATED
+                    ),
+                ];
+
+                $orWhereConditions = [
+                    "(" . implode($autoGeneratedCouponCondition, " AND ") . ")",
                     $connection->quoteInto(
                         '(main_table.coupon_type = ? AND main_table.use_auto_generation = 1 AND rule_coupons.type = 1)',
                         \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC

dev/tests/functional/lib/Magento/Mtf/Util/Filesystem/FileHelper.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Filesystem;
+
+/**
+ * Filesystem helper.
+ */
+class FileHelper
+{
+    /**
+     * Normalizes a file/directory path.
+     *
+     * @param string $path
+     * @param string $ds
+     * @return string
+     */
+    public function normalizePath($path, $ds = DIRECTORY_SEPARATOR)
+    {
+        $path = rtrim(strtr($path, '/\\', $ds . $ds), $ds);
+        if (strpos($ds . $path, "{$ds}.") === false && strpos($path, "{$ds}{$ds}") === false) {
+            return $path;
+        }
+
+        return $this->realpath($ds, $path);
+    }
+
+    /**
+     * Returns canonicalized pathname.
+     *
+     * @param string $ds
+     * @param string $path
+     * @return string
+     */
+    private function realpath($ds, $path)
+    {
+        $parts = [];
+        foreach (explode($ds, $path) as $part) {
+            if ($part === '..' && !empty($parts) && end($parts) !== '..') {
+                array_pop($parts);
+            } elseif ($part === '.' || $part === '' && !empty($parts)) {
+                continue;
+            } else {
+                $parts[] = $part;
+            }
+        }
+
+        $path = implode($ds, $parts);
+
+        return $path === '' ? '.' : $path;
+    }
+
+    /**
+     * Creates a new directory.
+     *
+     * @param string $path
+     * @param int $mode
+     * @param bool $recursive
+     * @return bool
+     * @throws \Exception
+     */
+    public function createDirectory($path, $mode = 0775, $recursive = true)
+    {
+        if (is_dir($path)) {
+            return true;
+        }
+        $parentDir = dirname($path);
+
+        if ($recursive && !is_dir($parentDir) && $parentDir !== $path) {
+            $this->createDirectory($parentDir, $mode, true);
+        }
+
+        try {
+            if (!mkdir($path, $mode)) {
+                return false;
+            }
+        } catch (\Exception $e) {
+            if (!is_dir($path)) {
+                throw new \Exception("Failed to create directory \"$path\"");
+            }
+        }
+
+        try {
+            return chmod($path, $mode);
+        } catch (\Exception $e) {
+            throw new \Exception("Failed to change permissions for directory \"$path\"");
+        }
+    }
+
+    /**
+     * Create a new file with content.
+     *
+     * @param string $filename
+     * @param string $content
+     * @return bool
+     */
+    public function createFile($filename, $content)
+    {
+        return file_put_contents($filename, $content) !== false;
+    }
+}

dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/Generator.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Generate\File;
+
+use Magento\Mtf\Util\Filesystem\FileHelper;
+
+/**
+ * File generator.
+ */
+class Generator
+{
+    /**
+     * Base directory for files.
+     */
+    const ROOT_DIRECTORY = '/var/tests/data/';
+
+    /**
+     * Directory for saving files.
+     *
+     * @var string
+     */
+    private $directory;
+
+    /**
+     * Filesystem helper.
+     *
+     * @var FileHelper
+     */
+    private $fileHelper;
+
+    /**
+     * @param FileHelper $fileHelper
+     * @param string $directory
+     */
+    public function __construct(FileHelper $fileHelper, $directory)
+    {
+        $this->fileHelper = $fileHelper;
+        $this->directory = $this->fileHelper->normalizePath(MTF_BP . static::ROOT_DIRECTORY . $directory);
+    }
+
+    /**
+     * Method is generate file by template.
+     *
+     * @param TemplateInterface $template
+     * @return string Full path to the generated file.
+     * @throws \Exception
+     */
+    public function generate(TemplateInterface $template)
+    {
+        $filename = $this->fileHelper->normalizePath($this->directory . '/' . $template->getName());
+        if (!$this->fileHelper->createDirectory($this->directory)
+            || !$this->fileHelper->createFile($filename, $template->render())
+        ) {
+            throw new \Exception(
+                'Can’t create file with "' . get_class($template) .'" (file "' .  $filename . '").'
+            );
+        }
+
+        return $filename;
+    }
+}

dev/tests/functional/lib/Magento/Mtf/Util/Generate/File/TemplateInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Mtf\Util\Generate\File;
+
+/**
+ * Interface for file template.
+ */
+interface TemplateInterface
+{
+    /**
+     * Create and return file content.
+     *
+     * @return string
+     */
+    public function render();
+
+    /**
+     * Get filename. Without directory.
+     *
+     * @return string
+     */
+    public function getName();
+}