Merge pull request #1041 from magento-engcom/develop-prs

[EngCom] Public Pull Requests

Author: vrann

.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/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',

app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php

@@ -9,7 +9,8 @@
  */
 namespace Magento\Config\Model\Config\Backend\Admin;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
+use Magento\Framework\App\ObjectManager;
 
 class Robots extends \Magento\Framework\App\Config\Value
 {
@@ -32,6 +33,7 @@ class Robots extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param DocumentRoot $documentRoot
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -41,10 +43,13 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null
     ) {
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
-        $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+
+        $documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
+        $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
         $this->_file = 'robots.txt';
     }
 

app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Config\Model\Config\Reader\Source\Deployed;
+
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\DeploymentConfig;
+
+/**
+ * Class DocumentRoot
+ * @package Magento\Config\Model\Config\Reader\Source\Deployed
+ */
+class DocumentRoot
+{
+    /**
+     * @var DeploymentConfig
+     */
+    private $config;
+
+    /**
+     * DocumentRoot constructor.
+     * @param DeploymentConfig $config
+     */
+    public function __construct(DeploymentConfig $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * A shortcut to load the document root path from the DirectoryList based on the
+     * deployment configuration.
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->isPub() ? DirectoryList::PUB : DirectoryList::ROOT;
+    }
+
+    /**
+     * Returns whether the deployment configuration specifies that the document root is
+     * in the pub/ folder. This affects ares such as sitemaps and robots.txt (and will
+     * likely be extended to control other areas).
+     *
+     * @return bool
+     */
+    public function isPub()
+    {
+        return (bool)$this->config->get(ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB);
+    }
+}

app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Reader\Source\Deployed;
+
+use Magento\Config\Model\Config\Reader;
+use Magento\Framework\App\Config;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
+
+/**
+ * Test class for checking settings that defined in config file
+ */
+class DocumentRootTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var DocumentRoot
+     */
+    private $documentRoot;
+
+    public function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->documentRoot = new DocumentRoot($this->configMock);
+    }
+
+    /**
+     * Ensures that the path returned matches the pub/ path.
+     */
+    public function testGetPath()
+    {
+        $this->configMockSetForDocumentRootIsPub();
+
+        $this->assertSame(DirectoryList::PUB, $this->documentRoot->getPath());
+    }
+
+    /**
+     * Ensures that the deployment configuration returns the mocked value for
+     * the pub/ folder.
+     */
+    public function testIsPub()
+    {
+        $this->configMockSetForDocumentRootIsPub();
+
+        $this->assertSame(true, $this->documentRoot->isPub());
+    }
+
+    private function configMockSetForDocumentRootIsPub()
+    {
+        $this->configMock->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                [
+                    ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB,
+                    null,
+                    true
+                ],
+            ]);
+    }
+}

app/code/Magento/ConfigurableProduct/Api/ConfigurableProductManagementInterface.php

@@ -24,7 +24,7 @@ public function generateVariation(\Magento\Catalog\Api\Data\ProductInterface $pr
     /**
      * Provide the number of product count
      *
-     * @param null|int $status
+     * @param int|null $status
      * @return int
      */
     public function getCount($status = null);

app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\DB\Logger\LoggerProxy;
+
+class QueryLogDisableCommand extends Command
+{
+    /**
+     * command name
+     */
+    const COMMAND_NAME = 'dev:query-log:disable';
+
+    /**
+     * Success message
+     */
+    const SUCCESS_MESSAGE = "DB query logging disabled.";
+
+    /**
+     * @var Writer
+     */
+    private $deployConfigWriter;
+
+    /**
+     * QueryLogDisableCommand constructor.
+     * @param Writer $deployConfigWriter
+     * @param null $name
+     */
+    public function __construct(
+        Writer $deployConfigWriter,
+        $name = null
+    ) {
+        parent::__construct($name);
+        $this->deployConfigWriter = $deployConfigWriter;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName(self::COMMAND_NAME)
+            ->setDescription('Disable DB query logging');
+
+        parent::configure();
+    }
+
+    /**
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $data = [LoggerProxy::PARAM_ALIAS => LoggerProxy::LOGGER_ALIAS_DISABLED];
+        $this->deployConfigWriter->saveConfig([ConfigFilePool::APP_ENV => [LoggerProxy::CONF_GROUP_NAME => $data]]);
+
+        $output->writeln("<info>". self::SUCCESS_MESSAGE . "</info>");
+    }
+}