Skip to content

Commit f1dc91b

Browse files
vrannvrann
authored
Merge pull request #902 from magento-engcom/develop-prs-isolated
[EngCom] Public Pull Requests
2 parents efbeb89 + 6a77b9d commit f1dc91b

File tree

29 files changed

+251
-104
lines changed

29 files changed

+251
-104
lines changed

‎app/code/Magento/CacheInvalidate/Model/PurgeCache.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public function sendPurgeRequest($tagsPattern)
5858
$headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $tagsPattern];
5959
$socketAdapter->setOptions(['timeout' => 10]);
6060
foreach ($servers as $server) {
61+
$headers['Host'] = $server->getHost();
6162
try {
6263
$socketAdapter->connect($server->getHost(), $server->getPort());
6364
$socketAdapter->write(

‎app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testSendPurgeRequest($hosts)
7070
->with($uri->getHost(), $uri->getPort());
7171
$this->socketAdapterMock->expects($this->at($i++))
7272
->method('write')
73-
->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags']);
73+
->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]);
7474
$i++;
7575
}
7676
$this->socketAdapterMock->expects($this->exactly(count($uris)))

‎app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
7474
$attributes = $this->_productIndexerHelper->getAttributes();
7575
$eavAttributes = $this->_productIndexerHelper->getTablesStructure($attributes);
7676
$entityTableColumns = $eavAttributes[$entityTableName];
77+
$linkField = $this->getMetadataPool()
78+
->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
79+
->getLinkField();
7780

7881
$temporaryEavAttributes = $eavAttributes;
7982

@@ -101,11 +104,11 @@ public function build($storeId, $changedIds, $valueFieldSuffix)
101104
$temporaryTableName = $this->_getTemporaryTableName($tableName);
102105

103106
//Add primary key to temporary table for increase speed of joins in future
104-
$this->_addPrimaryKeyToTable($temporaryTableName);
107+
$this->_addPrimaryKeyToTable($temporaryTableName, $linkField);
105108

106109
//Create temporary table for composite attributes
107110
if (isset($valueTables[$temporaryTableName . $valueFieldSuffix])) {
108-
$this->_addPrimaryKeyToTable($temporaryTableName . $valueFieldSuffix);
111+
$this->_addPrimaryKeyToTable($temporaryTableName . $valueFieldSuffix, $linkField);
109112
}
110113

111114
//Fill temporary tables with attributes grouped by it type

‎app/code/Magento/CatalogInventory/Helper/Stock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function addIsInStockFilterToCollection($collection)
156156
$resource = $this->getStockStatusResource();
157157
$resource->addStockDataToCollection(
158158
$collection,
159-
!$isShowOutOfStock && $collection->getFlag('require_stock_items')
159+
!$isShowOutOfStock || $collection->getFlag('require_stock_items')
160160
);
161161
$collection->setFlag($stockFlag, true);
162162
}

‎app/code/Magento/CatalogRule/view/adminhtml/ui_component/catalog_rule_form.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<field name="name">
7373
<argument name="data" xsi:type="array">
7474
<item name="config" xsi:type="array">
75-
<item name="label" xsi:type="string">Rule Name</item>
75+
<item name="label" xsi:type="string" translate="true">Rule Name</item>
7676
<item name="visible" xsi:type="boolean">true</item>
7777
<item name="dataType" xsi:type="string">text</item>
7878
<item name="formElement" xsi:type="string">input</item>
@@ -87,7 +87,7 @@
8787
<field name="description">
8888
<argument name="data" xsi:type="array">
8989
<item name="config" xsi:type="array">
90-
<item name="label" xsi:type="string">Description</item>
90+
<item name="label" xsi:type="string" translate="true">Description</item>
9191
<item name="visible" xsi:type="boolean">true</item>
9292
<item name="dataType" xsi:type="string">text</item>
9393
<item name="formElement" xsi:type="string">textarea</item>
@@ -99,7 +99,7 @@
9999
<field name="is_active">
100100
<argument name="data" xsi:type="array">
101101
<item name="config" xsi:type="array">
102-
<item name="label" xsi:type="string">Status</item>
102+
<item name="label" xsi:type="string" translate="true">Status</item>
103103
<item name="visible" xsi:type="boolean">true</item>
104104
<item name="dataType" xsi:type="string">number</item>
105105
<item name="formElement" xsi:type="string">select</item>
@@ -121,7 +121,7 @@
121121
<field name="website_ids">
122122
<argument name="data" xsi:type="array">
123123
<item name="config" xsi:type="array">
124-
<item name="label" xsi:type="string">Websites</item>
124+
<item name="label" xsi:type="string" translate="true">Websites</item>
125125
<item name="dataType" xsi:type="string">number</item>
126126
<item name="formElement" xsi:type="string">multiselect</item>
127127
<item name="validation" xsi:type="array">
@@ -140,7 +140,7 @@
140140
<field name="customer_group_ids">
141141
<argument name="data" xsi:type="array">
142142
<item name="config" xsi:type="array">
143-
<item name="label" xsi:type="string">Customer Groups</item>
143+
<item name="label" xsi:type="string" translate="true">Customer Groups</item>
144144
<item name="dataType" xsi:type="string">number</item>
145145
<item name="formElement" xsi:type="string">multiselect</item>
146146
<item name="validation" xsi:type="array">
@@ -149,13 +149,13 @@
149149
<item name="source" xsi:type="string">catalog_rule</item>
150150
<item name="dataScope" xsi:type="string">customer_group_ids</item>
151151
</item>
152-
<item name="options" xsi:type="object">\Magento\CatalogRule\Model\Rule\CustomerGroupsOptionsProvider</item>
152+
<item name="options" xsi:type="object">Magento\CatalogRule\Model\Rule\CustomerGroupsOptionsProvider</item>
153153
</argument>
154154
</field>
155155
<field name="from_date">
156156
<argument name="data" xsi:type="array">
157157
<item name="config" xsi:type="array">
158-
<item name="label" xsi:type="string">From</item>
158+
<item name="label" xsi:type="string" translate="true">From</item>
159159
<item name="visible" xsi:type="boolean">true</item>
160160
<item name="dataType" xsi:type="string">text</item>
161161
<item name="formElement" xsi:type="string">date</item>
@@ -170,7 +170,7 @@
170170
<field name="to_date">
171171
<argument name="data" xsi:type="array">
172172
<item name="config" xsi:type="array">
173-
<item name="label" xsi:type="string">To</item>
173+
<item name="label" xsi:type="string" translate="true">To</item>
174174
<item name="visible" xsi:type="boolean">true</item>
175175
<item name="dataType" xsi:type="string">text</item>
176176
<item name="formElement" xsi:type="string">date</item>
@@ -185,7 +185,7 @@
185185
<field name="sort_order">
186186
<argument name="data" xsi:type="array">
187187
<item name="config" xsi:type="array">
188-
<item name="label" xsi:type="string">Priority</item>
188+
<item name="label" xsi:type="string" translate="true">Priority</item>
189189
<item name="dataType" xsi:type="string">text</item>
190190
<item name="formElement" xsi:type="string">input</item>
191191
<item name="source" xsi:type="string">catalog_rule</item>
@@ -205,7 +205,7 @@
205205
<field name="simple_action">
206206
<argument name="data" xsi:type="array">
207207
<item name="config" xsi:type="array">
208-
<item name="label" xsi:type="string">Apply</item>
208+
<item name="label" xsi:type="string" translate="true">Apply</item>
209209
<item name="dataType" xsi:type="string">number</item>
210210
<item name="formElement" xsi:type="string">select</item>
211211
<item name="source" xsi:type="string">catalog_rule</item>
@@ -274,7 +274,7 @@
274274
<field name="discount_amount">
275275
<argument name="data" xsi:type="array">
276276
<item name="config" xsi:type="array">
277-
<item name="label" xsi:type="string">Discount Amount</item>
277+
<item name="label" xsi:type="string" translate="true">Discount Amount</item>
278278
<item name="dataType" xsi:type="string">text</item>
279279
<item name="formElement" xsi:type="string">input</item>
280280
<item name="source" xsi:type="string">catalog_rule</item>
@@ -288,7 +288,7 @@
288288
<field name="stop_rules_processing">
289289
<argument name="data" xsi:type="array">
290290
<item name="config" xsi:type="array">
291-
<item name="label" xsi:type="string">Discard subsequent rules</item>
291+
<item name="label" xsi:type="string" translate="true">Discard subsequent rules</item>
292292
<item name="fieldGroup" xsi:type="string">bool</item>
293293
<item name="dataType" xsi:type="string">number</item>
294294
<item name="formElement" xsi:type="string">select</item>

‎app/code/Magento/Customer/etc/config.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272
{{depend fax}}F: {{var fax}}{{/depend}}
7373
{{depend vat_id}}VAT: {{var vat_id}}{{/depend}}</text>
7474
<oneline>{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}</oneline>
75-
<html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}{{depend firstname}}<br/>{{/depend}}
75+
<html><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}{{depend firstname}}<br />{{/depend}}
7676
{{depend company}}{{var company}}<br />{{/depend}}
7777
{{if street1}}{{var street1}}<br />{{/if}}
7878
{{depend street2}}{{var street2}}<br />{{/depend}}
7979
{{depend street3}}{{var street3}}<br />{{/depend}}
8080
{{depend street4}}{{var street4}}<br />{{/depend}}
81-
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
82-
{{var country}}<br/>
81+
{{if city}}{{var city}}, {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br />
82+
{{var country}}<br />
8383
{{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
84-
{{depend fax}}<br/>F: {{var fax}}{{/depend}}
85-
{{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
84+
{{depend fax}}<br />F: {{var fax}}{{/depend}}
85+
{{depend vat_id}}<br />VAT: {{var vat_id}}{{/depend}}]]></html>
8686
<pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
8787
{{depend company}}{{var company}}|{{/depend}}
8888
{{if street1}}{{var street1}}|{{/if}}

‎app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,34 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
2121
*/
2222
protected $_variableFactory;
2323

24+
/**
25+
* @var \Magento\Framework\Serialize\Serializer\Json
26+
*/
27+
private $serializer;
28+
2429
/**
2530
* @param \Magento\Backend\Block\Template\Context $context
2631
* @param \Magento\Framework\Registry $registry
2732
* @param \Magento\Framework\Data\FormFactory $formFactory
2833
* @param \Magento\Variable\Model\VariableFactory $variableFactory
2934
* @param \Magento\Email\Model\Source\Variables $variables
3035
* @param array $data
36+
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
37+
* @throws \RuntimeException
3138
*/
3239
public function __construct(
3340
\Magento\Backend\Block\Template\Context $context,
3441
\Magento\Framework\Registry $registry,
3542
\Magento\Framework\Data\FormFactory $formFactory,
3643
\Magento\Variable\Model\VariableFactory $variableFactory,
3744
\Magento\Email\Model\Source\Variables $variables,
38-
array $data = []
45+
array $data = [],
46+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
3947
) {
4048
$this->_variableFactory = $variableFactory;
4149
$this->_variables = $variables;
50+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
51+
->get(\Magento\Framework\Serialize\Serializer\Json::class);
4252
parent::__construct($context, $registry, $formFactory, $data);
4353
}
4454

@@ -60,6 +70,7 @@ protected function _prepareLayout()
6070
* @return \Magento\Backend\Block\Widget\Form
6171
* @SuppressWarnings(PHPMD.NPathComplexity)
6272
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
73+
* @throws \Magento\Framework\Exception\LocalizedException
6374
*/
6475
protected function _prepareForm()
6576
{
@@ -100,7 +111,7 @@ protected function _prepareForm()
100111
$fieldset->addField(
101112
'variables',
102113
'hidden',
103-
['name' => 'variables', 'value' => \Zend_Json::encode($this->getVariables())]
114+
['name' => 'variables', 'value' => $this->serializer->serialize($this->getVariables())]
104115
);
105116
$fieldset->addField('template_variables', 'hidden', ['name' => 'template_variables']);
106117

‎app/code/Magento/Email/Controller/Adminhtml/Email/Template/DefaultTemplate.php

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,35 @@ class DefaultTemplate extends \Magento\Email\Controller\Adminhtml\Email\Template
1313
*/
1414
private $emailConfig;
1515

16+
/**
17+
* @var \Magento\Framework\Serialize\Serializer\Json
18+
*/
19+
private $serializer;
20+
1621
/**
1722
* @param \Magento\Backend\App\Action\Context $context
1823
* @param \Magento\Framework\Registry $coreRegistry
1924
* @param \Magento\Email\Model\Template\Config $emailConfig
25+
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
26+
* @throws \RuntimeException
2027
*/
2128
public function __construct(
2229
\Magento\Backend\App\Action\Context $context,
2330
\Magento\Framework\Registry $coreRegistry,
24-
\Magento\Email\Model\Template\Config $emailConfig
31+
\Magento\Email\Model\Template\Config $emailConfig,
32+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
2533
) {
2634
$this->emailConfig = $emailConfig;
35+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
36+
->get(\Magento\Framework\Serialize\Serializer\Json::class);
2737
parent::__construct($context, $coreRegistry);
2838
}
2939

3040
/**
3141
* Set template data to retrieve it in template info form
3242
*
3343
* @return void
44+
* @throws \RuntimeException
3445
*/
3546
public function execute()
3647
{
@@ -49,15 +60,18 @@ public function execute()
4960

5061
$template->loadDefault($templateId);
5162
$template->setData('orig_template_code', $templateId);
52-
$template->setData('template_variables', \Zend_Json::encode($template->getVariablesOptionArray(true)));
63+
$template->setData(
64+
'template_variables',
65+
$this->serializer->serialize($template->getVariablesOptionArray(true))
66+
);
5367

5468
$templateBlock = $this->_view->getLayout()->createBlock(
5569
\Magento\Email\Block\Adminhtml\Template\Edit::class
5670
);
5771
$template->setData('orig_template_currently_used_for', $templateBlock->getCurrentlyUsedForPaths(false));
5872

5973
$this->getResponse()->representJson(
60-
$this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($template->getData())
74+
$this->serializer->serialize($template->getData())
6175
);
6276
} catch (\Exception $e) {
6377
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);

‎app/code/Magento/Email/Model/BackendTemplate.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class BackendTemplate extends Template
3535
* @param \Magento\Email\Model\Template\FilterFactory $filterFactory
3636
* @param \Magento\Config\Model\Config\Structure $structure
3737
* @param array $data
38+
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
3839
*
3940
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
4041
*/
@@ -53,7 +54,8 @@ public function __construct(
5354
\Magento\Framework\UrlInterface $urlModel,
5455
\Magento\Email\Model\Template\FilterFactory $filterFactory,
5556
\Magento\Config\Model\Config\Structure $structure,
56-
array $data = []
57+
array $data = [],
58+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
5759
) {
5860
$this->structure = $structure;
5961
parent::__construct(
@@ -70,7 +72,8 @@ public function __construct(
7072
$filterManager,
7173
$urlModel,
7274
$filterFactory,
73-
$data
75+
$data,
76+
$serializer
7477
);
7578
}
7679

‎app/code/Magento/Email/Model/Template.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,12 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
9292
private $filterFactory;
9393

9494
/**
95-
* Initialize dependencies.
95+
* @var \Magento\Framework\Serialize\Serializer\Json
96+
*/
97+
private $serializer;
98+
99+
/**
100+
* Template constructor.
96101
*
97102
* @param \Magento\Framework\Model\Context $context
98103
* @param \Magento\Framework\View\DesignInterface $design
@@ -108,6 +113,8 @@ class Template extends AbstractTemplate implements \Magento\Framework\Mail\Templ
108113
* @param \Magento\Framework\UrlInterface $urlModel
109114
* @param Template\FilterFactory $filterFactory
110115
* @param array $data
116+
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
117+
* @throws \RuntimeException
111118
*
112119
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
113120
*/
@@ -125,9 +132,12 @@ public function __construct(
125132
\Magento\Framework\Filter\FilterManager $filterManager,
126133
\Magento\Framework\UrlInterface $urlModel,
127134
\Magento\Email\Model\Template\FilterFactory $filterFactory,
128-
array $data = []
135+
array $data = [],
136+
\Magento\Framework\Serialize\Serializer\Json $serializer = null
129137
) {
130138
$this->filterFactory = $filterFactory;
139+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
140+
->get(\Magento\Framework\Serialize\Serializer\Json::class);
131141
parent::__construct(
132142
$context,
133143
$design,
@@ -289,7 +299,7 @@ protected function _parseVariablesString($variablesString)
289299
$variables = [];
290300
if ($variablesString && is_string($variablesString)) {
291301
$variablesString = str_replace("\n", '', $variablesString);
292-
$variables = \Zend_Json::decode($variablesString);
302+
$variables = $this->serializer->unserialize($variablesString);
293303
}
294304
return $variables;
295305
}

0 commit comments

Comments
 (0)