merge magento/2.3-develop into magento-tsg/2.3-develop-pr20

Author: Magento CICD

app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php

@@ -46,6 +46,7 @@ public function getConfig(): array
             'sortOrder' => 30,
             'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
         ];
     }
 }

app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php

@@ -50,6 +50,7 @@ public function getConfig(): array
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
             'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'),
         ];
     }

app/code/Magento/CatalogGraphQl/Model/Layer/CollectionProvider.php

@@ -29,6 +29,10 @@ class CollectionProvider implements \Magento\Catalog\Model\Layer\ItemCollectionP
      */
     private $collectionProcessor;
 
+    /**
+     * @param \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory
+     */
     public function __construct(
         \Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface $collectionProcessor,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory

app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php

@@ -37,6 +37,9 @@ public function __construct(
         $this->newRelicWrapper = $newRelicWrapper;
     }
 
+    /**
+     * @param Observer $observer
+     */
     public function execute(Observer $observer)
     {
         if ($this->config->isNewRelicEnabled()) {

app/code/Magento/Sales/Setup/SalesSetup.php

@@ -303,6 +303,9 @@ public function getEncryptor()
         return $this->encryptor;
     }
 
+    /**
+     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     */
     public function getConnection()
     {
         return $this->getSetup()->getConnection(self::$connectionName);

app/code/Magento/Tax/Model/Config.php

@@ -832,20 +832,20 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;

app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

@@ -176,7 +176,7 @@ define([
             pageLimit: 50,
             deviation: 30,
             validationLoading: false,
-            isRemoveSelectedIcon: true,
+            isRemoveSelectedIcon: false,
             debounce: 300,
             missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
             isDisplayMissingValuePlaceholder: false,

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less

@@ -46,6 +46,11 @@
                     .lib-css(border-top, @checkout-payment-method-title__border);
                 }
             }
+            form {
+                &.form-purchase-order {
+                    margin-bottom: 15px;
+                }
+            }
         }
 
         .payment-method-content {

dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php

@@ -6,8 +6,11 @@
 
 namespace Magento\Test\Integrity;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * An integrity test that searches for references to static files and asserts that they are resolved via fallback
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StaticFilesTest extends \PHPUnit\Framework\TestCase
 {
@@ -36,6 +39,23 @@ class StaticFilesTest extends \PHPUnit\Framework\TestCase
      */
     private $baseTheme;
 
+    /**
+     * @var \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative
+     */
+    private $alternativeResolver;
+
+    /**
+     * Factory for simple rule
+     *
+     * @var \Magento\Framework\View\Design\Fallback\Rule\SimpleFactory
+     */
+    private $simpleFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
     protected function setUp()
     {
         $om = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager();
@@ -46,6 +66,11 @@ protected function setUp()
         $this->themeRepo = $om->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
         $this->design = $om->get(\Magento\Framework\View\DesignInterface::class);
         $this->baseTheme = $om->get(\Magento\Framework\View\Design\ThemeInterface::class);
+        $this->alternativeResolver = $om->get(
+            \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative::class
+        );
+        $this->simpleFactory = $om->get(\Magento\Framework\View\Design\Fallback\Rule\SimpleFactory::class);
+        $this->filesystem = $om->get(\Magento\Framework\Filesystem::class);
     }
 
     /**
@@ -93,8 +118,17 @@ public function testReferencesFromStaticFiles($area, $themePath, $locale, $modul
                 $relatedPath = \Magento\Framework\View\FileSystem::getRelatedPath($filePath, $relatedResource);
             }
             // the $relatedPath will be suitable for feeding to the fallback system
+            $staticFile = $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule);
+            if (empty($staticFile) && substr($relatedPath, 0, 2) === '..') {
+                //check if static file exists on lib level
+                $path = substr($relatedPath, 2);
+                $libDir = rtrim($this->filesystem->getDirectoryRead(DirectoryList::LIB_WEB)->getAbsolutePath(), '/');
+                $rule = $this->simpleFactory->create(['pattern' => $libDir]);
+                $params = ['area' => $area, 'theme' => $themePath, 'locale' => $locale];
+                $staticFile = $this->alternativeResolver->resolveFile($rule, $path, $params);
+            }
             $this->assertNotEmpty(
-                $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule),
+                $staticFile,
                 "The related resource cannot be resolved through fallback: '{$relatedResource}'"
             );
         }
@@ -132,7 +166,7 @@ private function getDefaultThemePath($area)
      * @param bool $isExplicit
      * @return bool|string
      */
-    private function getStaticFile($area, $theme, $locale, $filePath, $module, $isExplicit = false)
+    private function getStaticFile($area, $theme, $locale, $filePath, $module = null, $isExplicit = false)
     {
         if ($area == 'base') {
             $theme = $this->baseTheme;

lib/internal/Magento/Framework/Exception/AbstractAggregateException.php

@@ -78,6 +78,10 @@ public function addError(Phrase $phrase)
         return $this;
     }
 
+    /**
+     * @param LocalizedException $exception
+     * @return $this
+     */
     public function addException(LocalizedException $exception)
     {
         $this->addErrorCalls++;