Skip to content

Commit 0af7182

Browse files
author
Igor Melnikov
committed
Merge branch 'MAGETWO-64949-remaining-unserialize-ce' of github.com:magento-jackalopes/magento2ce into MAGETWO-64949-remaining-unserialize-ce
2 parents b0665a8 + e7f22f1 commit 0af7182

File tree

104 files changed

+640
-351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+640
-351
lines changed

‎PULL_REQUEST_TEMPLATE.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<!--- Provide a general summary of the Pull Request in the Title above -->
2+
3+
### Description
4+
<!--- Provide a description of the changes proposed in the pull request -->
5+
6+
### Fixed Issues (if relevant)
7+
<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant -->
8+
1. magento/magetno2#<issue_number>: Issue title
9+
2. ...
10+
11+
### Manual testing scenarios
12+
<!--- Provide a set of unambiguous steps to test the proposed code change -->
13+
1. ...
14+
2. ...
15+
16+
### Contribution checklist
17+
- [ ] Pull request has a meaningful description of its purpose
18+
- [ ] All commits are accompanied by meaningful commit messages
19+
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
20+
- [ ] All automated tests passed successfully (all builds on Travis CI are green)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function sendPurgeRequest($tagsPattern)
6767
'1.1',
6868
$headers
6969
);
70+
$socketAdapter->read();
7071
$socketAdapter->close();
7172
} catch (\Exception $e) {
7273
$this->logger->critical($e->getMessage(), compact('server', 'tagsPattern'));

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ public function testSendPurgeRequest($hosts)
7171
$this->socketAdapterMock->expects($this->at($i++))
7272
->method('write')
7373
->with('PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]);
74+
$this->socketAdapterMock->expects($this->at($i++))
75+
->method('read');
7476
$i++;
7577
}
7678
$this->socketAdapterMock->expects($this->exactly(count($uris)))

‎app/code/Magento/Captcha/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
</arguments>
3939
</type>
4040
<type name="Magento\Checkout\Block\Cart\Sidebar">
41-
<plugin name="login_captcha" type="\Magento\Captcha\Model\Cart\ConfigPlugin" sortOrder="50" />
41+
<plugin name="login_captcha" type="Magento\Captcha\Model\Cart\ConfigPlugin" sortOrder="50" />
4242
</type>
4343
</config>

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function execute()
3737
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
3838
$resultPage = $this->resultPageFactory->create();
3939
$resultPage->setActiveMenu('Magento_Catalog::catalog_products');
40-
$resultPage->getConfig()->getTitle()->prepend(__('Catalog'));
40+
$resultPage->getConfig()->getTitle()->prepend(__('Products'));
4141
return $resultPage;
4242
}
4343
}

‎app/code/Magento/Catalog/etc/adminhtml/menu.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_Catalog::catalog" title="Products" translate="title" module="Magento_Catalog" sortOrder="20" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
11-
<add id="Magento_Catalog::catalog_products" title="Catalog" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="catalog/product/" resource="Magento_Catalog::products"/>
10+
<add id="Magento_Catalog::catalog" title="Catalog" translate="title" module="Magento_Catalog" sortOrder="20" dependsOnModule="Magento_Catalog" resource="Magento_Catalog::catalog"/>
11+
<add id="Magento_Catalog::catalog_products" title="Products" translate="title" module="Magento_Catalog" sortOrder="10" parent="Magento_Catalog::inventory" action="catalog/product/" resource="Magento_Catalog::products"/>
1212
<add id="Magento_Catalog::catalog_categories" title="Categories" translate="title" module="Magento_Catalog" sortOrder="20" parent="Magento_Catalog::inventory" action="catalog/category/" resource="Magento_Catalog::categories"/>
1313
<add id="Magento_Catalog::catalog_attributes_attributes" title="Product" translate="title" module="Magento_Catalog" sortOrder="30" parent="Magento_Backend::stores_attributes" action="catalog/product_attribute/" resource="Magento_Catalog::attributes_attributes"/>
1414
<add id="Magento_Catalog::catalog_attributes_sets" title="Attribute Set" translate="title" module="Magento_Catalog" sortOrder="40" parent="Magento_Backend::stores_attributes" action="catalog/product_set/" resource="Magento_Catalog::sets"/>

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
</arguments>
403403
</type>
404404
<type name="Magento\CatalogInventory\Model\Config\Backend\ShowOutOfStock">
405-
<plugin name="showOutOfStockValueChanged" type="\Magento\Catalog\Model\Plugin\ShowOutOfStockConfig"/>
405+
<plugin name="showOutOfStockValueChanged" type="Magento\Catalog\Model\Plugin\ShowOutOfStockConfig"/>
406406
</type>
407407
<virtualType name="Magento\Catalog\Block\Category\Widget\Link" type="Magento\Catalog\Block\Widget\Link">
408408
<arguments>
@@ -479,23 +479,23 @@
479479
<plugin name="productListingAttributesCaching" type="Magento\Catalog\Plugin\Model\ResourceModel\Config" />
480480
</type>
481481
<preference for="Magento\Catalog\Api\ProductLinkTypeListInterface" type="Magento\Catalog\Model\Product\LinkTypeProvider" />
482-
<preference for="Magento\Catalog\Api\Data\ProductLinkAttributeInterface" type="\Magento\Catalog\Model\ProductLink\Attribute" />
482+
<preference for="Magento\Catalog\Api\Data\ProductLinkAttributeInterface" type="Magento\Catalog\Model\ProductLink\Attribute" />
483483
<preference for="Magento\Catalog\Api\Data\ProductLinkTypeInterface" type="Magento\Catalog\Model\ProductLink\Type" />
484484
<preference for="Magento\Catalog\Api\ProductLinkManagementInterface" type="Magento\Catalog\Model\ProductLink\Management" />
485485
<preference for="Magento\Catalog\Api\Data\ProductLinkInterface" type="Magento\Catalog\Model\ProductLink\Link" />
486-
<preference for="\Magento\Catalog\Api\CategoryLinkManagementInterface" type="\Magento\Catalog\Model\CategoryLinkManagement" />
486+
<preference for="Magento\Catalog\Api\CategoryLinkManagementInterface" type="Magento\Catalog\Model\CategoryLinkManagement" />
487487
<preference for="Magento\Catalog\Api\Data\ProductWebsiteLinkInterface" type="Magento\Catalog\Model\ProductWebsiteLink" />
488488
<preference for="Magento\Catalog\Api\ProductWebsiteLinkRepositoryInterface" type="Magento\Catalog\Model\ProductWebsiteLinkRepository" />
489-
<preference for="\Magento\Catalog\Api\CategoryLinkRepositoryInterface" type="\Magento\Catalog\Model\CategoryLinkRepository" />
489+
<preference for="Magento\Catalog\Api\CategoryLinkRepositoryInterface" type="Magento\Catalog\Model\CategoryLinkRepository" />
490490
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionInterface" type="Magento\Catalog\Model\Product\Option" />
491-
<preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="\Magento\Catalog\Model\Product\Option\Repository" />
491+
<preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="Magento\Catalog\Model\Product\Option\Repository" />
492492
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionTypeInterface" type="Magento\Catalog\Model\Product\Option\Type" />
493-
<preference for="Magento\Catalog\Api\ProductTierPriceManagementInterface" type="\Magento\Catalog\Model\Product\TierPriceManagement" />
494-
<preference for="Magento\Catalog\Api\ScopedProductTierPriceManagementInterface" type="\Magento\Catalog\Model\Product\ScopedTierPriceManagement" />
493+
<preference for="Magento\Catalog\Api\ProductTierPriceManagementInterface" type="Magento\Catalog\Model\Product\TierPriceManagement" />
494+
<preference for="Magento\Catalog\Api\ScopedProductTierPriceManagementInterface" type="Magento\Catalog\Model\Product\ScopedTierPriceManagement" />
495495
<preference for="Magento\Catalog\Api\Data\ProductTierPriceInterface" type="Magento\Catalog\Model\Product\TierPrice" />
496496
<preference for="Magento\Catalog\Api\Data\CategoryProductLinkInterface" type="Magento\Catalog\Model\CategoryProductLink" />
497497
<preference for="Magento\Catalog\Api\ProductCustomOptionTypeListInterface" type="Magento\Catalog\Model\ProductOptions\TypeList" />
498-
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface" type="\Magento\Catalog\Model\Product\Option\Value" />
498+
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionValuesInterface" type="Magento\Catalog\Model\Product\Option\Value" />
499499
<preference for="Magento\Catalog\Api\Data\CustomOptionInterface" type="Magento\Catalog\Model\CustomOptions\CustomOption" />
500500
<preference for="Magento\Catalog\Api\Data\ProductOptionInterface" type="Magento\Catalog\Model\ProductOption" />
501501
<preference for="Magento\Catalog\Api\Data\CategoryLinkInterface" type="Magento\Catalog\Model\CategoryLink" />
@@ -848,7 +848,7 @@
848848
<argument name="collectionProcessor" xsi:type="object">Magento\Catalog\Model\Api\SearchCriteria\ProductCollectionProcessor</argument>
849849
</arguments>
850850
</type>
851-
<type name="\Magento\Catalog\Model\CategoryList">
851+
<type name="Magento\Catalog\Model\CategoryList">
852852
<arguments>
853853
<argument name="collectionProcessor" xsi:type="object">Magento\Eav\Model\Api\SearchCriteria\CollectionProcessor</argument>
854854
</arguments>

‎app/code/Magento/Catalog/etc/frontend/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</argument>
5858
</arguments>
5959
</type>
60-
<type name="\Magento\Framework\Pricing\Render\PriceBox">
60+
<type name="Magento\Framework\Pricing\Render\PriceBox">
6161
<plugin name="catalog_price_box_key" type="Magento\Catalog\Block\Category\Plugin\PriceBoxTags" />
6262
</type>
6363
</config>

‎app/code/Magento/Catalog/view/frontend/layout/catalog_product_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<argument name="at_call" xsi:type="string">getShortDescription</argument>
9595
<argument name="at_code" xsi:type="string">short_description</argument>
9696
<argument name="css_class" xsi:type="string">overview</argument>
97-
<argument name="at_label" translate="true" xsi:type="string">none</argument>
97+
<argument name="at_label" xsi:type="string">none</argument>
9898
<argument name="title" translate="true" xsi:type="string">Overview</argument>
9999
<argument name="add_attribute" xsi:type="string">itemprop="description"</argument>
100100
</arguments>

‎app/code/Magento/CatalogImportExport/Model/Import/Product.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,7 @@ public function saveProductEntity(array $entityRowsIn, array $entityRowsUp)
13361336
$entityTable,
13371337
array_merge($this->getNewSkuFieldsForSelect(), $this->getOldSkuFieldsForSelect())
13381338
)->where(
1339-
'sku IN (?)',
1340-
array_keys($entityRowsIn)
1339+
$this->_connection->quoteInto('sku IN (?)', array_keys($entityRowsIn))
13411340
);
13421341
$newProducts = $this->_connection->fetchAll($select);
13431342
foreach ($newProducts as $data) {

0 commit comments

Comments
 (0)