Skip to content

Commit 962d59e

Browse files
author
Maksym Savich
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-31354
2 parents 33f0e07 + 18f28d2 commit 962d59e

File tree

143 files changed

+1248
-1959
lines changed

Some content is hidden

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

143 files changed

+1248
-1959
lines changed

‎app/code/Magento/Backend/Block/System/Cache/Form.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1414
{
1515
/**
16-
* @var \Magento\Core\Helper\Data
16+
* @var \Magento\Framework\App\Cache\TypeListInterface
1717
*/
18-
protected $_coreData;
18+
protected $cacheTypeList;
1919

2020
/**
2121
* @param \Magento\Backend\Block\Template\Context $context
2222
* @param \Magento\Framework\Registry $registry
2323
* @param \Magento\Framework\Data\FormFactory $formFactory
24-
* @param \Magento\Core\Helper\Data $coreData
24+
* @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
2525
* @param array $data
2626
*/
2727
public function __construct(
2828
\Magento\Backend\Block\Template\Context $context,
2929
\Magento\Framework\Registry $registry,
3030
\Magento\Framework\Data\FormFactory $formFactory,
31-
\Magento\Core\Helper\Data $coreData,
31+
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
3232
array $data = []
3333
) {
34-
$this->_coreData = $coreData;
34+
$this->cacheTypeList = $cacheTypeList;
3535
parent::__construct($context, $registry, $formFactory, $data);
3636
}
3737

@@ -63,7 +63,7 @@ public function initForm()
6363
]
6464
);
6565

66-
foreach ($this->_coreData->getCacheTypes() as $type => $label) {
66+
foreach ($this->cacheTypeList->getTypeLabels() as $type => $label) {
6767
$fieldset->addField(
6868
'enable_' . $type,
6969
'checkbox',

‎app/code/Magento/Backend/Helper/Dashboard/AbstractDashboard.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
*/
66
namespace Magento\Backend\Helper\Dashboard;
77

8-
use Magento\Core\Helper\Data as HelperData;
9-
108
/**
119
* Adminhtml abstract dashboard helper.
1210
*/
13-
abstract class AbstractDashboard extends HelperData
11+
abstract class AbstractDashboard extends \Magento\Framework\App\Helper\AbstractHelper
1412
{
1513
/**
1614
* Helper collection

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Data helper for dashboard
1212
*/
13-
class Data extends \Magento\Core\Helper\Data
13+
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1414
{
1515
/**
1616
* @var \Magento\Framework\Data\Collection\Db
@@ -27,33 +27,26 @@ class Data extends \Magento\Core\Helper\Data
2727
*/
2828
const INSTALL_DATE = 'install/date';
2929

30+
/**
31+
* @var \Magento\Framework\Store\StoreManagerInterface
32+
*/
33+
private $_storeManager;
34+
3035
/**
3136
* @param \Magento\Framework\App\Helper\Context $context
32-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
3337
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
34-
* @param \Magento\Framework\App\State $appState
35-
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
3638
* @param DeploymentConfig $deploymentConfig
37-
* @param bool $dbCompatibleMode
3839
*/
3940
public function __construct(
4041
\Magento\Framework\App\Helper\Context $context,
41-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
4242
\Magento\Framework\Store\StoreManagerInterface $storeManager,
43-
\Magento\Framework\App\State $appState,
44-
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
45-
DeploymentConfig $deploymentConfig,
46-
$dbCompatibleMode = true
43+
DeploymentConfig $deploymentConfig
4744
) {
4845
parent::__construct(
49-
$context,
50-
$scopeConfig,
51-
$storeManager,
52-
$appState,
53-
$priceCurrency,
54-
$dbCompatibleMode
46+
$context
5547
);
5648
$this->_installDate = $deploymentConfig->get(self::INSTALL_DATE);
49+
$this->_storeManager = $storeManager;
5750
}
5851

5952
/**

‎app/code/Magento/Backend/Helper/Dashboard/Order.php

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,16 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
1717

1818
/**
1919
* @param \Magento\Framework\App\Helper\Context $context
20-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
2120
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
22-
* @param \Magento\Framework\App\State $appState
23-
* @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
2421
* @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
25-
* @param bool $dbCompatibleMode
2622
*/
2723
public function __construct(
2824
\Magento\Framework\App\Helper\Context $context,
29-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
30-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
31-
\Magento\Framework\App\State $appState,
32-
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
33-
\Magento\Reports\Model\Resource\Order\Collection $orderCollection,
34-
$dbCompatibleMode = true
25+
\Magento\Reports\Model\Resource\Order\Collection $orderCollection
3526
) {
3627
$this->_orderCollection = $orderCollection;
3728
parent::__construct(
38-
$context,
39-
$scopeConfig,
40-
$storeManager,
41-
$appState,
42-
$priceCurrency,
43-
$dbCompatibleMode
29+
$context
4430
);
4531
}
4632

‎app/code/Magento/Backend/Model/Translate/Inline/Config.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,38 @@ class Config implements \Magento\Framework\Translate\Inline\ConfigInterface
1313
/**
1414
* @var \Magento\Backend\App\ConfigInterface
1515
*/
16-
protected $_config;
16+
protected $config;
1717

1818
/**
19-
* @var \Magento\Core\Helper\Data
19+
* @var \Magento\Developer\Helper\Data
2020
*/
21-
protected $_helper;
21+
protected $devHelper;
2222

2323
/**
2424
* @param \Magento\Backend\App\ConfigInterface $config
25-
* @param \Magento\Core\Helper\Data $helper
25+
* @param \Magento\Developer\Helper\Data $devHelper
2626
*/
27-
public function __construct(\Magento\Backend\App\ConfigInterface $config, \Magento\Core\Helper\Data $helper)
28-
{
29-
$this->_config = $config;
30-
$this->_helper = $helper;
27+
public function __construct(
28+
\Magento\Backend\App\ConfigInterface $config,
29+
\Magento\Developer\Helper\Data $devHelper
30+
) {
31+
$this->config = $config;
32+
$this->devHelper = $devHelper;
3133
}
3234

3335
/**
3436
* {@inheritdoc}
3537
*/
3638
public function isActive($scope = null)
3739
{
38-
return $this->_config->isSetFlag('dev/translate_inline/active_admin');
40+
return $this->config->isSetFlag('dev/translate_inline/active_admin');
3941
}
4042

4143
/**
4244
* {@inheritdoc}
4345
*/
4446
public function isDevAllowed($scope = null)
4547
{
46-
return $this->_helper->isDevAllowed($scope);
48+
return $this->devHelper->isDevAllowed($scope);
4749
}
4850
}

‎app/code/Magento/Backend/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"magento/module-store": "0.42.0-beta7",
77
"magento/module-directory": "0.42.0-beta7",
88
"magento/module-core": "0.42.0-beta7",
9+
"magento/module-developer": "0.42.0-beta7",
910
"magento/module-eav": "0.42.0-beta7",
1011
"magento/module-cron": "0.42.0-beta7",
1112
"magento/module-theme": "0.42.0-beta7",

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
1010

11-
use Magento\Bundle\Model\Product\Price;
12-
1311
/**
1412
* Bundle option renderer
1513
*/
@@ -30,9 +28,9 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
3028
protected $_showSingle;
3129

3230
/**
33-
* @var \Magento\Core\Helper\Data
31+
* @var \Magento\Framework\Pricing\Helper\Data
3432
*/
35-
protected $_coreHelper;
33+
protected $pricingHelper;
3634

3735
/**
3836
* @var \Magento\Tax\Helper\Data
@@ -53,7 +51,7 @@ class Option extends \Magento\Bundle\Block\Catalog\Product\Price
5351
* @param \Magento\Framework\Math\Random $mathRandom
5452
* @param \Magento\Checkout\Helper\Cart $cartHelper
5553
* @param \Magento\Tax\Helper\Data $taxData
56-
* @param \Magento\Core\Helper\Data $coreHelper
54+
* @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
5755
* @param array $data
5856
*
5957
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -67,10 +65,10 @@ public function __construct(
6765
\Magento\Framework\Math\Random $mathRandom,
6866
\Magento\Checkout\Helper\Cart $cartHelper,
6967
\Magento\Tax\Helper\Data $taxData,
70-
\Magento\Core\Helper\Data $coreHelper,
68+
\Magento\Framework\Pricing\Helper\Data $pricingHelper,
7169
array $data = []
7270
) {
73-
$this->_coreHelper = $coreHelper;
71+
$this->pricingHelper = $pricingHelper;
7472
$this->_catalogHelper = $catalogData;
7573
$this->_taxHelper = $taxData;
7674
parent::__construct(
@@ -248,7 +246,7 @@ public function getSelectionPrice($selection)
248246
1
249247
);
250248
if (is_numeric($price)) {
251-
$price = $this->_coreHelper->currencyByStore($price, $store, false);
249+
$price = $this->pricingHelper->currencyByStore($price, $store, false);
252250
}
253251
}
254252
return is_numeric($price) ? $price : 0;

‎app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
1717
/**
1818
* Core data
1919
*
20-
* @var \Magento\Core\Helper\Data
20+
* @var \Magento\Framework\Pricing\Helper\Data
2121
*/
22-
protected $coreData;
22+
protected $pricingHelper;
2323

2424
/**
2525
* Catalog product configuration
@@ -38,17 +38,17 @@ class Configuration extends AbstractHelper implements ConfigurationInterface
3838
/**
3939
* @param \Magento\Framework\App\Helper\Context $context
4040
* @param \Magento\Catalog\Helper\Product\Configuration $productConfiguration
41-
* @param \Magento\Core\Helper\Data $coreData
41+
* @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
4242
* @param \Magento\Framework\Escaper $escaper
4343
*/
4444
public function __construct(
4545
\Magento\Framework\App\Helper\Context $context,
4646
\Magento\Catalog\Helper\Product\Configuration $productConfiguration,
47-
\Magento\Core\Helper\Data $coreData,
47+
\Magento\Framework\Pricing\Helper\Data $pricingHelper,
4848
\Magento\Framework\Escaper $escaper
4949
) {
5050
$this->productConfiguration = $productConfiguration;
51-
$this->coreData = $coreData;
51+
$this->pricingHelper = $pricingHelper;
5252
$this->escaper = $escaper;
5353
parent::__construct($context);
5454
}
@@ -139,7 +139,9 @@ public function getBundleOptions(ItemInterface $item)
139139
$option['value'][] = $qty . ' x '
140140
. $this->escaper->escapeHtml($bundleSelection->getName())
141141
. ' '
142-
. $this->coreData->currency($this->getSelectionFinalPrice($item, $bundleSelection));
142+
. $this->pricingHelper->currency(
143+
$this->getSelectionFinalPrice($item, $bundleSelection)
144+
);
143145
}
144146
}
145147

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
144144
* @param \Magento\Eav\Model\Config $eavConfig
145145
* @param \Magento\Catalog\Model\Product\Type $catalogProductType
146146
* @param \Magento\Framework\Event\ManagerInterface $eventManager
147-
* @param \Magento\Core\Helper\Data $coreData
148147
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDb
149148
* @param \Magento\Framework\Filesystem $filesystem
150149
* @param \Magento\Framework\Registry $coreRegistry
@@ -170,7 +169,6 @@ public function __construct(
170169
\Magento\Eav\Model\Config $eavConfig,
171170
\Magento\Catalog\Model\Product\Type $catalogProductType,
172171
\Magento\Framework\Event\ManagerInterface $eventManager,
173-
\Magento\Core\Helper\Data $coreData,
174172
\Magento\Core\Helper\File\Storage\Database $fileStorageDb,
175173
\Magento\Framework\Filesystem $filesystem,
176174
\Magento\Framework\Registry $coreRegistry,
@@ -206,7 +204,6 @@ public function __construct(
206204
$eavConfig,
207205
$catalogProductType,
208206
$eventManager,
209-
$coreData,
210207
$fileStorageDb,
211208
$filesystem,
212209
$coreRegistry,

‎app/code/Magento/Captcha/Helper/Adminhtml/Data.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,19 @@ class Data extends \Magento\Captcha\Helper\Data
2121
/**
2222
* @param \Magento\Framework\App\Helper\Context $context
2323
* @param \Magento\Store\Model\StoreManager $storeManager
24-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
2524
* @param \Magento\Framework\Filesystem $filesystem
2625
* @param \Magento\Captcha\Model\CaptchaFactory $factory
2726
* @param \Magento\Backend\App\ConfigInterface $backendConfig
2827
*/
2928
public function __construct(
3029
\Magento\Framework\App\Helper\Context $context,
3130
\Magento\Store\Model\StoreManager $storeManager,
32-
\Magento\Framework\App\Config\ScopeConfigInterface $config,
3331
\Magento\Framework\Filesystem $filesystem,
3432
\Magento\Captcha\Model\CaptchaFactory $factory,
3533
\Magento\Backend\App\ConfigInterface $backendConfig
3634
) {
3735
$this->_backendConfig = $backendConfig;
38-
parent::__construct($context, $storeManager, $config, $filesystem, $factory);
36+
parent::__construct($context, $storeManager, $filesystem, $factory);
3937
}
4038

4139
/**

0 commit comments

Comments
 (0)