Skip to content

Commit 922b391

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #15023: Fixed typos in .less files (by @kalpmehta) - #15018: chore: upgrade Node.js to 8 (by @DanielRuf) - #15015: Fix typo in less button definition (by @shochdoerfer) - #14976: Changed the length of the remote_ip field to store ipv6 addresses (by @georgeschiopu) - #14946: use "Module_Name::template/path" format instead of using template/path i� (by @Jakhotiya) Fixed GitHub Issues: - #10395: REMOTE_IP gets saved partially when using IPV6 (reported by @keevitaja) has been fixed in #14976 by @georgeschiopu in 2.2-develop branch Related commits: 1. ba224b4 2. a08f378
2 parents de5a599 + 0125c44 commit 922b391

File tree

10 files changed

+76
-32
lines changed

10 files changed

+76
-32
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
global:
2020
- COMPOSER_BIN_DIR=~/bin
2121
- INTEGRATION_SETS=3
22-
- NODE_JS_VERSION=6
22+
- NODE_JS_VERSION=8
2323
- MAGENTO_HOST_NAME="magento2.travis"
2424
matrix:
2525
- TEST_SUITE=unit

‎app/code/Magento/Quote/Setup/UpgradeSchema.php

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ class UpgradeSchema implements UpgradeSchemaInterface
2626
public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
2727
{
2828
$setup->startSetup();
29-
3029
if (version_compare($context->getVersion(), '2.0.1', '<')) {
3130
$setup->getConnection(self::$connectionName)->addIndex(
3231
$setup->getTable('quote_id_mask', self::$connectionName),
3332
$setup->getIdxName('quote_id_mask', ['masked_id'], '', self::$connectionName),
3433
['masked_id']
3534
);
3635
}
37-
3836
if (version_compare($context->getVersion(), '2.0.2', '<')) {
3937
$setup->getConnection(self::$connectionName)->changeColumn(
4038
$setup->getTable('quote_address', self::$connectionName),
@@ -101,25 +99,51 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
10199
);
102100
}
103101
if (version_compare($context->getVersion(), '2.0.7', '<')) {
104-
$connection = $setup->getConnection(self::$connectionName);
105-
$connection->modifyColumn(
106-
$setup->getTable('quote_address', self::$connectionName),
107-
'telephone',
108-
['type' => Table::TYPE_TEXT, 'length' => 255]
109-
)->modifyColumn(
110-
$setup->getTable('quote_address', self::$connectionName),
111-
'fax',
112-
['type' => Table::TYPE_TEXT, 'length' => 255]
113-
)->modifyColumn(
114-
$setup->getTable('quote_address', self::$connectionName),
115-
'region',
116-
['type' => Table::TYPE_TEXT, 'length' => 255]
117-
)->modifyColumn(
118-
$setup->getTable('quote_address', self::$connectionName),
119-
'city',
120-
['type' => Table::TYPE_TEXT, 'length' => 255]
121-
);
102+
$this->expandQuoteAddressFields($setup);
103+
}
104+
if (version_compare($context->getVersion(), '2.0.8', '<')) {
105+
$this->expandRemoteIpField($setup);
122106
}
123107
$setup->endSetup();
124108
}
109+
110+
/**
111+
* @param SchemaSetupInterface $setup
112+
* @return void
113+
*/
114+
private function expandRemoteIpField(SchemaSetupInterface $setup)
115+
{
116+
$connection = $setup->getConnection(self::$connectionName);
117+
$connection->modifyColumn(
118+
$setup->getTable('quote', self::$connectionName),
119+
'remote_ip',
120+
['type' => Table::TYPE_TEXT, 'length' => 45]
121+
);
122+
}
123+
124+
/**
125+
* @param SchemaSetupInterface $setup
126+
* @return void
127+
*/
128+
private function expandQuoteAddressFields(SchemaSetupInterface $setup)
129+
{
130+
$connection = $setup->getConnection(self::$connectionName);
131+
$connection->modifyColumn(
132+
$setup->getTable('quote_address', self::$connectionName),
133+
'telephone',
134+
['type' => Table::TYPE_TEXT, 'length' => 255]
135+
)->modifyColumn(
136+
$setup->getTable('quote_address', self::$connectionName),
137+
'fax',
138+
['type' => Table::TYPE_TEXT, 'length' => 255]
139+
)->modifyColumn(
140+
$setup->getTable('quote_address', self::$connectionName),
141+
'region',
142+
['type' => Table::TYPE_TEXT, 'length' => 255]
143+
)->modifyColumn(
144+
$setup->getTable('quote_address', self::$connectionName),
145+
'city',
146+
['type' => Table::TYPE_TEXT, 'length' => 255]
147+
);
148+
}
125149
}

‎app/code/Magento/Quote/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Magento_Quote" setup_version="2.0.7">
9+
<module name="Magento_Quote" setup_version="2.0.8">
1010
</module>
1111
</config>

‎app/code/Magento/Review/Block/Product/ReviewRenderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class ReviewRenderer extends \Magento\Framework\View\Element\Template implements
1818
* @var array
1919
*/
2020
protected $_availableTemplates = [
21-
self::FULL_VIEW => 'helper/summary.phtml',
22-
self::SHORT_VIEW => 'helper/summary_short.phtml',
21+
self::FULL_VIEW => 'Magento_Review::helper/summary.phtml',
22+
self::SHORT_VIEW => 'Magento_Review::helper/summary_short.phtml',
2323
];
2424

2525
/**

‎app/code/Magento/Sales/Setup/UpgradeSchema.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
106106
]
107107
);
108108
}
109+
if (version_compare($context->getVersion(), '2.0.10', '<')) {
110+
$this->expandRemoteIpField($installer);
111+
}
109112
}
110113

111114
/**
@@ -141,4 +144,21 @@ private function addIndexBaseGrandTotal(SchemaSetupInterface $installer)
141144
['base_grand_total']
142145
);
143146
}
147+
148+
/**
149+
* @param SchemaSetupInterface $installer
150+
* @return void
151+
*/
152+
private function expandRemoteIpField(SchemaSetupInterface $installer)
153+
{
154+
$connection = $installer->getConnection(self::$connectionName);
155+
$connection->modifyColumn(
156+
$installer->getTable('sales_order', self::$connectionName),
157+
'remote_ip',
158+
[
159+
'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
160+
'length' => 45
161+
]
162+
);
163+
}
144164
}

‎app/code/Magento/Sales/etc/module.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
9-
<module name="Magento_Sales" setup_version="2.0.9">
9+
<module name="Magento_Sales" setup_version="2.0.10">
1010
<sequence>
1111
<module name="Magento_Rule"/>
1212
<module name="Magento_Catalog"/>

‎lib/web/css/docs/source/_buttons.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ button {
397397

398398
// # Button with an icon on the left or right side of the text
399399
//
400-
// <code>@_button-icon-font-position</code> variable is used to set up the icon postiton
400+
// <code>@_button-icon-font-position</code> variable is used to set up the icon position
401401
//
402402
// Use <code>before</code> to set up button icon position on the left:
403403
// ```css
@@ -818,7 +818,7 @@ button {
818818

819819
// # Link as a button
820820
//
821-
// The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate paremeters.
821+
// The <code>.lib-link-as-button()</code> mixin is used to reset link styles (text-decoration and display inline). Then to make it look like a button, you need to add the <code>.lib-button()</code> mixin with appropriate parameters.
822822
//
823823
// ```html
824824
// <a href="#" class="example-button-9"><span>Button</span></a>

‎lib/web/css/docs/source/_layout.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ footer.footer {
9191
// <th>@gutter-width</th>
9292
// <td class="vars_value">0</td>
9393
// <td class="vars_value">'' | false | value</td>
94-
// <td>Distanse between columns</td>
94+
// <td>Distance between columns</td>
9595
// </tr>
9696
// <tr>
9797
// <th colspan="4" class="vars_section">Variables for layout columns</th>
@@ -361,7 +361,7 @@ footer.footer {
361361

362362
// # Layout width
363363
//
364-
// The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applyed to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
364+
// The <code>.lib-layout-width()</code> mixin is used to set default page width of the element the mixin is applied to. It can be used to set width for the whole page wrapper or for the page elements individualy like header, footer, and so on.
365365

366366
// # Layout width variables
367367
//

‎lib/web/css/docs/source/_typography.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
// # Typogrphy
6+
// # Typography
77
//
88
// Magento UI library provides mixins for typography styling. To configure typography, global variables from **_variables.less** file are used.
99
//
@@ -978,7 +978,7 @@
978978

979979
// # Text hide
980980
//
981-
// The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applyed to.
981+
// The <code>.lib-text-hide()</code> mixin hides a text of the element the mixin is applied to.
982982
//
983983
// ```html
984984
// <p class="example-text-hide">

‎lib/web/css/source/lib/_buttons.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// _____________________________________________
99

1010
//
11-
// Button with solid or pictire background
11+
// Button with solid or picture background
1212
// ---------------------------------------------
1313

1414
.lib-button(

0 commit comments

Comments
 (0)