Skip to content

Commit ee7576e

Browse files
author
Magento CICD
authored
merge magento/2.3-develop into magento-performance/MAGETWO-90564
2 parents b45a68f + a60b822 commit ee7576e

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
44
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
55
<h2>Welcome</h2>
6-
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
6+
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
77

88
## Magento system requirements
99
[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,13 @@ public function insertForce($table, array $bind);
495495
/**
496496
* Updates table rows with specified data based on a WHERE clause.
497497
*
498+
* The $where parameter in this instance can be a single WHERE clause or an array containing a multiple. In all
499+
* instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}. In the event you use an array,
500+
* you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
501+
*
502+
* If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
503+
* parenthesis. If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
504+
*
498505
* @param mixed $table The table to update.
499506
* @param array $bind Column-value pairs.
500507
* @param mixed $where UPDATE WHERE clause(s).

0 commit comments

Comments
 (0)