Merge remote-tracking branch 'mainline/2.1-develop' into DEVOPS-2174-2.1

Author: slavvka

README.md

@@ -74,6 +74,19 @@ To suggest documentation improvements, click [here][4].
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h2>Reporting security issues</h2>
 
 To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:security@magento.com">security@magento.com</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.

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

@@ -22,15 +22,11 @@
         class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
         <?php /* @noEscape */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
-    <?php if ($block->getSchema()): ?>
-        <span class="_hidden" itemprop="price">
-            <?php /* @noEscape */ echo $block->getDisplayValue()  ?>
-        </span>
-    <?php endif; ?>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
+        <meta itemprop="price" content="<?php /* @noEscape */ echo $block->getDisplayValue(); ?>" />
         <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
     <?php endif; ?>
 </span>

app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml

@@ -17,13 +17,19 @@ $minProduct = $block->getSaleableItem()
     ->getMinProduct();
 
 if ($minProduct) {
+    $finalPrice = $minProduct->getPriceInfo()->getPrice('final_price');
+    $finalPriceValue = $finalPrice->getAmount();
     $amountRender = $block->getRendererPool()
         ->createAmountRender(
-            $minProduct->getPriceInfo()->getPrice('final_price')->getAmount(),
+            $finalPriceValue,
             $minProduct,
-            $minProduct->getPriceInfo()->getPrice('final_price'),
+            $finalPrice,
             ['include_container' => true]
         );
+    $currencyCode = $amountRender->getDisplayCurrencyCode();
+} else {
+    $finalPriceValue = 0;
+    $currencyCode = '';
 }
 ?>
 <div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
@@ -32,4 +38,6 @@ if ($minProduct) {
         <span class="price-label"><?php /* @escapeNotVerified */ echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
     </p>
     <?php endif ?>
+    <meta itemprop="price" content="<?php /* @noEscape */ echo $finalPriceValue; ?>" />
+    <meta itemprop="priceCurrency" content="<?php /* @noEscape */ echo $currencyCode; ?>" />
 </div>

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

@@ -189,10 +189,6 @@
                         &:last-child {
                             margin-bottom: 0;
                         }
-
-                        &._hidden {
-                            display: none;
-                        }
                     }
                 }
             }

lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php

@@ -492,6 +492,13 @@ public function insertForce($table, array $bind);
     /**
      * Updates table rows with specified data based on a WHERE clause.
      *
+     * The $where parameter in this instance can be a single WHERE clause or an array containing a multiple.  In all
+     * instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}.  In the event you use an array,
+     * you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
+     *
+     * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
+     * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
+     *
      * @param  mixed        $table The table to update.
      * @param  array        $bind  Column-value pairs.
      * @param  mixed        $where UPDATE WHERE clause(s).
@@ -928,7 +935,6 @@ public function getDateExtractSql($date, $unit);
      */
     public function getTableName($tableName);
 
-
     /**
      * Build a trigger name based on table name and trigger details
      *