Second Store View
second_store_view_
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
index ea5d9aab8b26d..fb98c66983776 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminNewStoreGroupSection.xml
@@ -11,5 +11,6 @@
+
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index 8d4400b3d0477..e00c41d371c9e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -21,7 +21,7 @@ $stores = $block->getStoresSortedBySortOrder();
|
escapeHtml(__('Is Default')) ?> |
-
getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required"
colspan="2">
escapeHtml($_store->getName()) ?>
@@ -75,7 +75,7 @@ $stores = $block->getStoresSortedBySortOrder();
getId(); ?>
- |
+ |
getStoresSortedBySortOrder();
type="text" value="<%- data.swatch %>"
placeholder="escapeHtml(__("Swatch")) ?>"/>
|
-
+ |
-
+
-
+
@@ -156,12 +156,12 @@
-
+
-
+
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index 148267feeaad0..62f51e74b6007 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -273,7 +273,7 @@
-
+
Magento\Theme\Model\ResourceModel\Theme\Collection
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
index f68a6f97d964f..ca82ff81d3b6f 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/client.js
@@ -54,7 +54,7 @@ define([
/**
* Proxy save method which might invoke
- * data valiation prior to its' saving.
+ * data validation prior to its' saving.
*
* @param {Object} data - Data to be processed.
* @returns {jQueryPromise}
@@ -128,7 +128,7 @@ define([
/**
* Handles ajax success callback.
*
- * @param {jQueryPromise} promise - Promise to be resoloved.
+ * @param {jQueryPromise} promise - Promise to be resolved.
* @param {*} data - See 'jquery' ajax success callback.
*/
onSuccess: function (promise, data) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
index a4785aea03743..ece49cc8fe27c 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/editor.js
@@ -357,7 +357,7 @@ define([
/**
* Resets specific records' data
- * to the data present in asscotiated row.
+ * to the data present in associated row.
*
* @param {(Number|String)} id - See 'getId' method.
* @param {Boolean} [isIndex=false] - See 'getId' method.
@@ -403,7 +403,7 @@ define([
/**
* Disables editing of specified fields.
*
- * @param {Array} fields - An array of fields indeces to be disabled.
+ * @param {Array} fields - An array of fields indexes to be disabled.
* @returns {Editor} Chainable.
*/
disableFields: function (fields) {
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
index c648875e62d7c..9b8998368c5ff 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -264,7 +264,7 @@ define([
/**
* Validates all of the available fields.
*
- * @returns {Array} An array with validatation results.
+ * @returns {Array} An array with validation results.
*/
validate: function () {
return this.elems.map('validate');
@@ -306,7 +306,7 @@ define([
},
/**
- * Updates 'fields' array filling it with available edtiors
+ * Updates 'fields' array filling it with available editors
* or with column instances if associated field is not present.
*
* @returns {Record} Chainable.
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 06f68db05398f..43efb6a91c01f 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -332,6 +332,14 @@ public function setRequest(RateRequest $request)
$destCountry = self::GUAM_COUNTRY_ID;
}
+ // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
+ if ($destCountry === self::SPAIN_COUNTRY_ID &&
+ ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID
+ || $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+ ) {
+ $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
+ }
+
$country = $this->_countryFactory->create()->load($destCountry);
$rowRequest->setDestCountry($country->getData('iso2_code') ?: $destCountry);
@@ -1700,6 +1708,7 @@ public function getCustomizableContainerTypes()
/**
* Get delivery confirmation level based on origin/destination
+ *
* Return null if delivery confirmation is not acceptable
*
* @param string|null $countyDestination
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
similarity index 84%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
index 1158f471d51f0..eb8344008794f 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -5,7 +5,8 @@
* See COPYING.txt for license details.
*/
-->
-
+
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
similarity index 64%
rename from app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
rename to app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index 220c9a444b02f..d3b19a3f00bcf 100644
--- a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -5,8 +5,9 @@
* See COPYING.txt for license details.
*/
-->
-
-
+
+
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
index 5b866b45e2fbe..64068a0a5ef58 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditUserSection.xml
@@ -5,8 +5,12 @@
* See COPYING.txt for license details.
*/
-->
-
+
+
+
+
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index 056d58b4c70be..b56aa4b5b3c8d 100755
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -6,10 +6,14 @@
namespace Magento\Wishlist\Controller\Index;
use Magento\Framework\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
use Magento\Framework\Exception\NotFoundException;
use Magento\Framework\Controller\ResultFactory;
-class Update extends \Magento\Wishlist\Controller\AbstractIndex
+/**
+ * Class Update
+ */
+class Update extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPostActionInterface
{
/**
* @var \Magento\Wishlist\Controller\WishlistProviderInterface
@@ -83,8 +87,6 @@ public function execute()
)->defaultCommentString()
) {
$description = '';
- } elseif (!strlen($description)) {
- $description = $item->getDescription();
}
$qty = null;
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
new file mode 100644
index 0000000000000..800b0a060edac
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfProdAddToCartWishListWithUnselectedAttrTest.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index cab130f7c2104..7a166b47256cb 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -154,18 +154,12 @@ define([
$.each(elementValue, function (key, option) {
data[elementName + '[' + option + ']'] = option;
});
+ } else if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
+ elementName = elementName.substring(0, elementName.length - 2);
+
+ data[elementName + '[' + elementValue + ']'] = elementValue;
} else {
- if (elementValue) { //eslint-disable-line no-lonely-if
- if (elementName.substr(elementName.length - 2) == '[]') { //eslint-disable-line eqeqeq, max-depth
- elementName = elementName.substring(0, elementName.length - 2);
-
- if (elementValue) { //eslint-disable-line max-depth
- data[elementName + '[' + elementValue + ']'] = elementValue;
- }
- } else {
- data[elementName] = elementValue;
- }
- }
+ data[elementName] = elementValue;
}
return data;
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
index 3355950254072..ffbbaeb084162 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -15,6 +15,14 @@
}
}
+.catalog-category-edit {
+ .admin__grid-control {
+ .admin__grid-control-value {
+ display: none;
+ }
+ }
+}
+
.product-composite-configure-inner {
.admin__control-text {
&.qty {
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
index 1e76679f594c1..fa1ae25628986 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/_order.less
@@ -92,6 +92,14 @@
margin: 0;
padding: 0;
}
+ .admin__data-grid-pager-wrap{
+ .selectmenu {
+ margin-bottom: 10px;
+ }
+ }
+ .data-grid-search-control-wrap {
+ margin-bottom: 10px;
+ }
}
//
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
index 95d7f8f65fdc1..efc747e4d714a 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -146,13 +146,13 @@
}
.action-close {
- padding: @modal-popup__padding;
+ padding: @modal-popup__padding - 2;
&:active,
&:focus {
background: transparent;
- padding-right: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
- padding-top: @modal-popup__padding + (@modal-action-close__font-size - @modal-action-close__active__font-size) / 2;
+ padding-right: @modal-popup__padding - 2;
+ padding-top: @modal-popup__padding - 2;
}
}
}
diff --git a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
index 3746df14b9c62..eab36e9a837f2 100644
--- a/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Wishlist/web/css/source/_module.less
@@ -212,6 +212,7 @@
&-actions {
display: block;
+ float: left;
.action {
margin-right: 15px;
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
index 4499886ef0f10..21b7315779764 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_navigation.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
@@ -131,12 +131,18 @@
);
}
}
-
.switcher-dropdown {
.lib-list-reset-styles();
+ display: none;
padding: @indent__s 0;
}
-
+ .switcher-options {
+ &.active {
+ .switcher-dropdown {
+ display: block;
+ }
+ }
+ }
.header.links {
.lib-list-reset-styles();
border-bottom: 1px solid @color-gray82;
@@ -207,7 +213,7 @@
}
.nav-toggle {
- &:after{
+ &:after {
background: rgba(0, 0, 0, @overlay__opacity);
content: '';
display: block;
diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
index 43ae23bab7895..eeb17653c877b 100644
--- a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -253,7 +253,7 @@
.box-tocart {
.action.primary {
margin-right: 1%;
- width: 49%;
+ width: auto;
}
}
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 5aaf0cd02fab9..c7d659810f522 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -492,6 +492,17 @@
}
}
}
+
+ .cart.table-wrapper,
+ .order-items.table-wrapper {
+ .col.price,
+ .col.qty,
+ .col.subtotal,
+ .col.msrp {
+ text-align: left;
+ }
+ }
+
}
//
diff --git a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
index a3896e41c94bc..e5d03fb9f2fcb 100644
--- a/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Wishlist/web/css/source/_module.less
@@ -221,6 +221,7 @@
&-actions {
display: block;
+ float: left;
.action {
margin-right: 15px;
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 521d7d68ac4a6..5cb5b4db72769 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -271,7 +271,7 @@
No Coupon
1
Yes
- [Total Items Quantity|equals or greater than|3]{Product attribute combination|FOUND|ALL|:[[Category|is|2]]}
+ [Total Items Quantity|equals or greater than|3]
Percent of product price discount
25
No
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
index e160fef609545..3dfe4cf118552 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/ApplySeveralSalesRuleEntityTest.xml
@@ -31,7 +31,6 @@
- stable:no
active_sales_rule_product_attribute
active_sales_total_items
250.00
@@ -44,7 +43,6 @@
- to_maintain:yes
active_sales_rule_row_total
active_sales_total_items
simple_for_salesrule_1
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
index 794fce17480fa..a5c69bcd3239e 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerMetadataTest.php
@@ -239,10 +239,10 @@ public function testGetCustomerAttributeMetadata()
$this->assertNotEmpty($attributes);
// remove odd extension attributes
- $allAtrributes = $expectAttrsWithVals;
- $allAtrributes['created_at'] = $attributes['created_at'];
- $allAtrributes['updated_at'] = $attributes['updated_at'];
- $attributes = array_intersect_key($attributes, $allAtrributes);
+ $allAttributes = $expectAttrsWithVals;
+ $allAttributes['created_at'] = $attributes['created_at'];
+ $allAttributes['updated_at'] = $attributes['updated_at'];
+ $attributes = array_intersect_key($attributes, $allAttributes);
foreach ($attributes as $attributeCode => $attributeValue) {
$this->assertNotNull($attributeCode);
diff --git a/lib/internal/LinLibertineFont/ChangeLog.txt b/lib/internal/LinLibertineFont/ChangeLog.txt
index 8dc2c56567a4b..83b8792e71eda 100644
--- a/lib/internal/LinLibertineFont/ChangeLog.txt
+++ b/lib/internal/LinLibertineFont/ChangeLog.txt
@@ -952,7 +952,7 @@ Changes to version 0.5.8 regular(|) & italic(/) (20040315)
Changes to version 0.5.7 regular(|) & italic(/) (20040315)
-N is now 66pt wider
-^ {Ascicircum} is now better
-- {exclamdown} is now availible
+- {exclamdown} is now available
- {currency} has been added
| "-" hyphen is the same as softhyphen. length is now 510pt
-bars have been made
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig.php
index 615c295675adc..40b03b068d6ab 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig.php
@@ -70,6 +70,11 @@ public function get($key = null, $defaultValue = null)
if ($key === null) {
return $this->flatData;
}
+
+ if (array_key_exists($key, $this->flatData) && $this->flatData[$key] === null) {
+ return '';
+ }
+
return $this->flatData[$key] ?? $defaultValue;
}
@@ -146,6 +151,8 @@ private function load()
}
/**
+ * Array keys conversion
+ *
* Convert associative array of arbitrary depth to a flat associative array with concatenated key path as keys
* each level of array is accessible by path key
*
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5c9bc9c2fb2d7..f654fd263f605 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Framework\DB\Adapter;
use Magento\Framework\DB\Ddl\Table;
@@ -365,6 +366,7 @@ public function getIndexList($tableName, $schemaName = null);
/**
* Add new Foreign Key to table
+ *
* If Foreign Key with same name is exist - it will be deleted
*
* @param string $fkName
@@ -373,7 +375,6 @@ public function getIndexList($tableName, $schemaName = null);
* @param string $refTableName
* @param string $refColumnName
* @param string $onDelete
- * @param string $onUpdate
* @param boolean $purge trying remove invalid data
* @param string $schemaName
* @param string $refSchemaName
@@ -484,6 +485,7 @@ public function insert($table, array $bind);
/**
* Inserts a table row with specified data
+ *
* Special for Zero values to identity column
*
* @param string $table
@@ -502,9 +504,9 @@ public function insertForce($table, array $bind);
* 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).
+ * @param mixed $table The table to update.
+ * @param array $bind Column-value pairs.
+ * @param mixed $where UPDATE WHERE clause(s).
* @return int The number of affected rows.
*/
public function update($table, array $bind, $where = '');
@@ -512,8 +514,8 @@ public function update($table, array $bind, $where = '');
/**
* Deletes table rows based on a WHERE clause.
*
- * @param mixed $table The table to update.
- * @param mixed $where DELETE WHERE clause(s).
+ * @param mixed $table The table to update.
+ * @param mixed $where DELETE WHERE clause(s).
* @return int The number of affected rows.
*/
public function delete($table, $where = '');
@@ -521,31 +523,33 @@ public function delete($table, $where = '');
/**
* Prepares and executes an SQL statement with bound data.
*
- * @param mixed $sql The SQL statement with placeholders.
+ * @param mixed $sql The SQL statement with placeholders.
* May be a string or \Magento\Framework\DB\Select.
- * @param mixed $bind An array of data or data itself to bind to the placeholders.
+ * @param mixed $bind An array of data or data itself to bind to the placeholders.
* @return \Zend_Db_Statement_Interface
*/
public function query($sql, $bind = []);
/**
* Fetches all SQL result rows as a sequential array.
+ *
* Uses the current fetchMode for the adapter.
*
- * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
- * @param mixed $bind Data to bind into SELECT placeholders.
- * @param mixed $fetchMode Override current fetch mode.
+ * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
+ * @param mixed $bind Data to bind into SELECT placeholders.
+ * @param mixed $fetchMode Override current fetch mode.
* @return array
*/
public function fetchAll($sql, $bind = [], $fetchMode = null);
/**
* Fetches the first row of the SQL result.
+ *
* Uses the current fetchMode for the adapter.
*
* @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
* @param mixed $bind Data to bind into SELECT placeholders.
- * @param mixed $fetchMode Override current fetch mode.
+ * @param mixed $fetchMode Override current fetch mode.
* @return array
*/
public function fetchRow($sql, $bind = [], $fetchMode = null);
@@ -622,9 +626,9 @@ public function quote($value, $type = null);
* // $safe = "WHERE date < '2005-01-02'"
*
*
- * @param string $text The text with a placeholder.
- * @param mixed $value The value to quote.
- * @param string $type OPTIONAL SQL datatype
+ * @param string $text The text with a placeholder.
+ * @param mixed $value The value to quote.
+ * @param string $type OPTIONAL SQL datatype
* @param integer $count OPTIONAL count of placeholders to replace
* @return string An SQL-safe quoted value placed into the original text.
*/
@@ -633,7 +637,7 @@ public function quoteInto($text, $value, $type = null, $count = null);
/**
* Quotes an identifier.
*
- * Accepts a string representing a qualified indentifier. For Example:
+ * Accepts a string representing a qualified identifier. For Example:
*
* $adapter->quoteIdentifier('myschema.mytable')
*
@@ -721,7 +725,8 @@ public function disallowDdlCache();
/**
* Reset cached DDL data from cache
- * if table name is null - reset all cached DDL data
+ *
+ * If table name is null - reset all cached DDL data
*
* @param string $tableName
* @param string $schemaName OPTIONAL
@@ -741,6 +746,7 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data);
/**
* Load DDL data from cache
+ *
* Return false if cache does not exists
*
* @param string $tableCacheKey the table cache key
@@ -784,6 +790,7 @@ public function prepareSqlCondition($fieldName, $condition);
/**
* Prepare value for save in column
+ *
* Return converted to column data type value
*
* @param array $column the column describe array
@@ -813,6 +820,7 @@ public function getIfNullSql($expression, $value = 0);
/**
* Generate fragment of SQL, that combine together (concatenate) the results from data array
+ *
* All arguments in data must be quoted
*
* @param array $data
@@ -823,6 +831,7 @@ public function getConcatSql(array $data, $separator = null);
/**
* Generate fragment of SQL that returns length of character string
+ *
* The string argument must be quoted
*
* @param string $string
@@ -931,6 +940,7 @@ public function getDateExtractSql($date, $unit);
/**
* Retrieve valid table name
+ *
* Check table name length and allowed symbols
*
* @param string $tableName
@@ -950,6 +960,7 @@ public function getTriggerName($tableName, $time, $event);
/**
* Retrieve valid index name
+ *
* Check index name length and allowed symbols
*
* @param string $tableName
@@ -961,6 +972,7 @@ public function getIndexName($tableName, $fields, $indexType = '');
/**
* Retrieve valid foreign key name
+ *
* Check foreign key name length and allowed symbols
*
* @param string $priTableName
@@ -1047,6 +1059,7 @@ public function supportStraightJoin();
/**
* Adds order by random to select object
+ *
* Possible using integer field for optimization
*
* @param \Magento\Framework\DB\Select $select
@@ -1074,6 +1087,7 @@ public function getPrimaryKeyName($tableName, $schemaName = null);
/**
* Converts fetched blob into raw binary PHP data.
+ *
* Some DB drivers return blobs as hex-coded strings, so we need to process them.
*
* @param mixed $value
@@ -1114,6 +1128,8 @@ public function dropTrigger($triggerName, $schemaName = null);
public function getTables($likeCondition = null);
/**
+ * Generates case SQL fragment
+ *
* Generate fragment of SQL, that check value against multiple condition cases
* and return different result depends on them
*
diff --git a/lib/internal/Magento/Framework/Option/ArrayPool.php b/lib/internal/Magento/Framework/Option/ArrayPool.php
index 5ac349d99b82e..11e1b46ff0363 100644
--- a/lib/internal/Magento/Framework/Option/ArrayPool.php
+++ b/lib/internal/Magento/Framework/Option/ArrayPool.php
@@ -28,13 +28,14 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
*
* @param string $model
* @throws \InvalidArgumentException
- * @return \Magento\Framework\Option\ArrayInterface
+ * @return \Magento\Framework\Data\OptionSourceInterface
*/
public function get($model)
{
$modelInstance = $this->_objectManager->get($model);
- if (false == $modelInstance instanceof \Magento\Framework\Option\ArrayInterface) {
- throw new \InvalidArgumentException($model . 'doesn\'t implement \Magento\Framework\Option\ArrayInterface');
+ if (false == $modelInstance instanceof \Magento\Framework\Data\OptionSourceInterface) {
+ throw new \InvalidArgumentException($model
+ . 'doesn\'t implement \Magento\Framework\Data\OptionSourceInterface');
}
return $modelInstance;
}
diff --git a/phpserver/README.md b/phpserver/README.md
index 414ad77ae6b33..563d2ed7c9fc9 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -31,7 +31,7 @@ For more informations about the installation process using the CLI, you can cons
### How to run Magento
-Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ../phpserver/router.php```
+Example usage: ```php -S 127.0.0.1:8082 -t ./pub/ ./phpserver/router.php```
### What exactly the script does
diff --git a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
index 74c2e3b24234c..cc1cca74ed6df 100644
--- a/setup/src/Magento/Setup/Console/Command/InstallCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InstallCommand.php
@@ -183,7 +183,7 @@ protected function configure()
self::INPUT_KEY_INTERACTIVE_SETUP,
self::INPUT_KEY_INTERACTIVE_SETUP_SHORTCUT,
InputOption::VALUE_NONE,
- 'Interactive Magento instalation'
+ 'Interactive Magento installation'
),
new InputOption(
OperationsExecutor::KEY_SAFE_MODE,
|