Merge remote-tracking branch 'mainline/develop' into pull-request

Author: Cari Spruiell

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -133,4 +133,9 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Backend\Model\AdminPathConfig" />
+    <type name="Magento\Framework\View\Page\Config">
+        <arguments>
+            <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Catalog/Api/AttributeSetFinderInterface.php

@@ -6,6 +6,10 @@
  */
 namespace Magento\Catalog\Api;
 
+/**
+ * Interface AttributeSetFinderInterface
+ * @api
+ */
 interface AttributeSetFinderInterface
 {
     /**

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

@@ -6,6 +6,10 @@
  */
 namespace Magento\Catalog\Api\Data;
 
+/**
+ * Interface CategoryProductSearchResultInterface
+ * @api
+ */
 interface CategoryProductSearchResultInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
     /**

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

@@ -9,6 +9,7 @@
 
 /**
  * Product option interface
+ * @api
  */
 interface ProductOptionInterface extends ExtensibleDataInterface
 {

app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php

@@ -6,6 +6,10 @@
 
 namespace Magento\Catalog\Api;
 
+/**
+ * Interface ProductWebsiteLinkRepositoryInterface
+ * @api
+ */
 interface ProductWebsiteLinkRepositoryInterface
 {
     /**

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -16,9 +16,8 @@
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
-
+use Magento\Catalog\Model\Product\Visibility;
 /**
  * Import entity product model
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -104,6 +103,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const COL_CATEGORY = 'categories';
 
+    /**
+     * Column product visibility.
+     */
+    const COL_VISIBILITY = 'visibility';
+
     /**
      * Column product sku.
      */
@@ -2286,7 +2290,8 @@ public function validateRow(array $rowData, $rowNum)
         }
         // validate custom options
         $this->getOptionEntity()->validateRow($rowData, $rowNum);
-        if (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME])) {
+
+        if ($this->isNeedToValidateUrlKey($rowData)) {
             $urlKey = $this->getUrlKey($rowData);
             $storeCodes = empty($rowData[self::COL_STORE_VIEW_CODE])
                 ? array_flip($this->storeResolver->getStoreCodeToId())
@@ -2308,6 +2313,18 @@ public function validateRow(array $rowData, $rowNum)
         return !$this->getErrorAggregator()->isRowInvalid($rowNum);
     }
 
+    /**
+     * @param array $rowData
+     * @return bool
+     */
+    private function isNeedToValidateUrlKey($rowData)
+    {
+        return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
+            && (empty($rowData[self::COL_VISIBILITY])
+            || $rowData[self::COL_VISIBILITY]
+            !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
+    }
+
     /**
      * Prepare new SKU data
      *

app/code/Magento/CatalogRule/Api/CatalogRuleRepositoryInterface.php

@@ -5,34 +5,34 @@
  */
 namespace Magento\CatalogRule\Api;
 
+/**
+ * Interface CatalogRuleRepositoryInterface
+ * @api
+ */
 interface CatalogRuleRepositoryInterface
 {
     /**
-     * @api
      * @param \Magento\CatalogRule\Api\Data\RuleInterface $rule
      * @return \Magento\CatalogRule\Api\Data\RuleInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      */
     public function save(\Magento\CatalogRule\Api\Data\RuleInterface $rule);
 
     /**
-     * @api
      * @param int $ruleId
      * @return \Magento\CatalogRule\Api\Data\RuleInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function get($ruleId);
 
     /**
-     * @api
      * @param \Magento\CatalogRule\Api\Data\RuleInterface $rule
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
      */
     public function delete(\Magento\CatalogRule\Api\Data\RuleInterface $rule);
 
     /**
-     * @api
      * @param int $ruleId
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotDeleteException

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php

@@ -113,7 +113,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId)
         $collection = $this->productFactory->create()
             ->getCollection()
             ->addCategoryIds()
-            ->addAttributeToSelect(['name', 'url_path', 'url_key'])
+            ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addWebsiteFilter($websiteIds);
         foreach ($collection as $product) {
             /** @var \Magento\Catalog\Model\Product $product */

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php

@@ -100,7 +100,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId, $storeId)
         $collection = $this->productFactory->create()
             ->getCollection()
             ->addCategoryIds()
-            ->addAttributeToSelect(['name', 'url_path', 'url_key'])
+            ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addWebsiteFilter($websiteIds);
         foreach ($collection as $product) {
             $product->setStoreId($storeId);

app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php

@@ -12,6 +12,7 @@
 use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Store\Model\Store;
+use Magento\Catalog\Model\Product\Visibility;
 
 /**
  * Class ProductUrlRewriteGenerator
@@ -98,6 +99,10 @@ private function getAnchorUrlRewriteGenerator()
      */
     public function generate(Product $product)
     {
+        if ($product->getVisibility() == Visibility::VISIBILITY_NOT_VISIBLE) {
+            return [];
+        }
+
         $this->product = $product;
         $storeId = $this->product->getStoreId();