Merge remote-tracking branch 'pub/develop' into MAGETWO-52958-1

Author: vkorotun

.gitignore

@@ -5,8 +5,12 @@
 /.settings
 atlassian*
 /nbproject
+/robots.txt
+/pub/robots.txt
 /sitemap
 /sitemap.xml
+/pub/sitemap
+/pub/sitemap.xml
 /.idea
 /.gitattributes
 /app/config_sandbox

.travis.yml

@@ -9,7 +9,6 @@ addons:
     - postfix
 language: php
 php:
-  - 5.6.29
   - 7.0
 env:
   global:
@@ -30,12 +29,6 @@ cache:
     - $HOME/.nvm
     - $HOME/node_modules
     - $HOME/yarn.lock
-matrix:
-  exclude:
-    - php: 5.6.29
-      env: TEST_SUITE=static
-    - php: 5.6.29
-      env: TEST_SUITE=js
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh

app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php

@@ -138,7 +138,7 @@ public function getContent();
     /**
      * Set media gallery content
      *
-     * @param $content \Magento\Framework\Api\Data\ImageContentInterface
+     * @param \Magento\Framework\Api\Data\ImageContentInterface $content
      * @return $this
      */
     public function setContent($content);

app/code/Magento/Catalog/Block/Product/View/Options.php

@@ -208,7 +208,7 @@ public function getJsonConfig()
         $config = [];
         foreach ($this->getOptions() as $option) {
             /* @var $option \Magento\Catalog\Model\Product\Option */
-            if ($option->getGroupByType() == \Magento\Catalog\Model\Product\Option::OPTION_GROUP_SELECT) {
+            if ($option->hasValues()) {
                 $tmpPriceValues = [];
                 foreach ($option->getValues() as $valueId => $value) {
                     $tmpPriceValues[$valueId] = $this->_getPriceConfiguration($value);

app/code/Magento/Catalog/Model/Product/Option.php

@@ -217,6 +217,17 @@ public function getValueById($valueId)
         return null;
     }
 
+    /**
+     * Whether or not the option type contains sub-values
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function hasValues($type = null)
+    {
+        return $this->getGroupByType($type) == self::OPTION_GROUP_SELECT;
+    }
+
     /**
      * @return ProductCustomOptionValuesInterface[]|null
      */

app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php

@@ -35,6 +35,15 @@ public function testGetProductSku()
         $this->assertEquals($productSku, $this->model->getProductSku());
     }
 
+    public function testHasValues()
+    {
+        $this->model->setType('drop_down');
+        $this->assertTrue($this->model->hasValues());
+
+        $this->model->setType('field');
+        $this->assertFalse($this->model->hasValues());
+    }
+
     public function testGetRegularPrice()
     {
         $priceInfoMock = $this->getMockForAbstractClass(

app/code/Magento/CatalogInventory/Model/StockManagement.php

@@ -102,7 +102,7 @@ public function registerProductsSale($items, $websiteId = null)
             if (!$stockItem->hasAdminArea()
                 && !$this->stockState->checkQty($productId, $orderedQty, $stockItem->getWebsiteId())
             ) {
-                $this->getResource()->commit();
+                $this->getResource()->rollBack();
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Not all of your products are available in the requested quantity.')
                 );
@@ -180,7 +180,7 @@ protected function getProductType($productId)
     }
 
     /**
-     * @return Stock
+     * @return ResourceStock
      */
     protected function getResource()
     {

app/code/Magento/CatalogWidget/Model/Rule.php

@@ -9,7 +9,9 @@
 use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
- * Class Rule
+ * Rule for catalog widget
+ *
+ * @api
  */
 class Rule extends \Magento\Rule\Model\AbstractModel
 {

app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php

@@ -3,12 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\CatalogWidget\Model\Rule\Condition;
 
 /**
- * CatalogWidget Rule Combine Condition data model
+ * Combination of product conditions
  */
-namespace Magento\CatalogWidget\Model\Rule\Condition;
-
 class Combine extends \Magento\Rule\Model\Condition\Combine
 {
     /**
@@ -54,7 +53,7 @@ public function getNewChildSelectOptions()
         foreach ($productAttributes as $code => $label) {
             if (!in_array($code, $this->excludedAttributes)) {
                 $attributes[] = [
-                    'value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|' . $code,
+                    'value' => Product::class . '|' . $code,
                     'label' => $label,
                 ];
             }

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

@@ -152,7 +152,7 @@ public function prepareResultPage(Action $action, $pageId = null)
         $resultPage = $this->resultPageFactory->create();
         $this->setLayoutType($inRange, $resultPage);
         $resultPage->addHandle('cms_page_view');
-        $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
+        $resultPage->addPageLayoutHandles(['id' => str_replace('/', '_', $this->_page->getIdentifier())]);
 
         $this->_eventManager->dispatch(
             'cms_page_render',