Skip to content

Commit d1416b0

Browse files
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #12954: [Backport to 2.1-develop] Fix #2156 Js\Dataprovider uses the RendererInterface. (by @dverkade) - #12952: [Backport #12668 into 2.1-develop] Fix for reverting stock twice for cancelled orders (by @dverkade) Fixed GitHub Issues: - #2156: Why does \Magento\Translation\Model\Js\DataProvider use \Magento\Framework\Phrase\Renderer\Translate, not \Magento\Framework\Phrase\Renderer\Composite? (reported by @dmitry-fedyuk) has been fixed in #12954 by @dverkade in 2.1-develop branch Related commits: 1. 65c99b9 2. f215350 3. a0b7bc5 - #9969: Cancel order and restore quote methods increase stocks twice (reported by @simpleadm) has been fixed in #12952 by @dverkade in 2.1-develop branch Related commits: 1. bbe2f1a 2. b5b59be
2 parents 23924be + c3a35d3 commit d1416b0

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

app/code/Magento/CatalogInventory/etc/events.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* Copyright © 2013-2018 Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->
@@ -27,9 +27,6 @@
2727
<event name="sales_model_service_quote_submit_failure">
2828
<observer name="inventory" instance="Magento\CatalogInventory\Observer\RevertQuoteInventoryObserver"/>
2929
</event>
30-
<event name="restore_quote">
31-
<observer name="inventory" instance="Magento\CatalogInventory\Observer\RevertQuoteInventoryObserver"/>
32-
</event>
3330
<event name="sales_order_item_cancel">
3431
<observer name="inventory" instance="Magento\CatalogInventory\Observer\CancelOrderItemObserver"/>
3532
</event>

app/code/Magento/Translation/Model/Js/DataProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © 2013-2018 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66

@@ -42,15 +42,15 @@ class DataProvider implements DataProviderInterface
4242
/**
4343
* Basic translate renderer
4444
*
45-
* @var \Magento\Framework\Phrase\Renderer\Translate
45+
* @var \Magento\Framework\Phrase\RendererInterface
4646
*/
4747
protected $translate;
4848

4949
/**
5050
* @param \Magento\Framework\App\State $appState
5151
* @param Config $config
5252
* @param \Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory
53-
* @param \Magento\Framework\Phrase\Renderer\Translate $translate
53+
* @param \Magento\Framework\Phrase\RendererInterface $translate
5454
* @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
5555
* @param \Magento\Framework\Component\DirSearch $dirSearch
5656
* @param \Magento\Framework\View\Design\Theme\ThemePackageList $themePackageList
@@ -60,7 +60,7 @@ public function __construct(
6060
\Magento\Framework\App\State $appState,
6161
Config $config,
6262
\Magento\Framework\Filesystem\File\ReadFactory $fileReadFactory,
63-
\Magento\Framework\Phrase\Renderer\Translate $translate,
63+
\Magento\Framework\Phrase\RendererInterface $translate,
6464
\Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
6565
\Magento\Framework\Component\DirSearch $dirSearch,
6666
\Magento\Framework\View\Design\Theme\ThemePackageList $themePackageList,

lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/InlineTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
3+
* Copyright © 2013-2018 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
66
namespace Magento\Framework\Phrase\Test\Unit\Renderer;
@@ -13,7 +13,7 @@ class InlineTest extends \PHPUnit_Framework_TestCase
1313
protected $translator;
1414

1515
/**
16-
* @var \Magento\Framework\Phrase\Renderer\Translate
16+
* @var \Magento\Framework\Phrase\Renderer\Inline
1717
*/
1818
protected $renderer;
1919

0 commit comments

Comments
 (0)