Merge branch 'develop' of github.com:magento-folks/magento2ce into MAGETWO-57215

Author: omiroshnichenko

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -337,7 +337,6 @@ window.setRowVisibility = setRowVisibility;
 window.showDefaultRows = showDefaultRows;
 window.switchDefaultValueField = switchDefaultValueField;
 window.switchIsFilterable = switchIsFilterable;
-window.switchIsFilterable = switchIsFilterable;
 window.bindAttributeInputType = bindAttributeInputType;
 window.checkOptionsPanelVisibility = checkOptionsPanelVisibility;
 window.getFrontTab = getFrontTab;

app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

@@ -19,14 +19,14 @@
         <?php echo($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
         data-price-amount="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>"
         data-price-type="<?php /* @escapeNotVerified */ echo $block->getPriceType(); ?>"
-        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>"
-        <?php echo $block->getSchema() ? ' itemprop="price"' : '' ?>>
+        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
         <?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
+        <meta itemprop="price" content="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>" />
         <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
     <?php endif; ?>
 </span>

app/code/Magento/Sales/Model/OrderRepository.php

@@ -99,7 +99,7 @@ public function get($id)
      * Find entities by criteria
      *
      * @param \Magento\Framework\Api\SearchCriteria $searchCriteria
-     * @return OrderInterface[]
+     * @return \Magento\Sales\Api\Data\OrderSearchResultInterface
      */
     public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
     {

lib/internal/Magento/Framework/App/Bootstrap.php

@@ -135,7 +135,7 @@ public static function populateAutoloader($rootDir, $initParams)
     {
         $dirList = self::createFilesystemDirectoryList($rootDir, $initParams);
         $autoloadWrapper = AutoloaderRegistry::getAutoloader();
-        Populator::populateMappings($autoloadWrapper, $dirList, new ComponentRegistrar());
+        Populator::populateMappings($autoloadWrapper, $dirList);
     }
 
     /**