Skip to content

Commit 618dd7b

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main/develop' into MAGETWO-33080
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
2 parents a86b5b3 + e85f2eb commit 618dd7b

File tree

1,087 files changed

+20998
-16552
lines changed

Some content is hidden

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

1,087 files changed

+20998
-16552
lines changed

‎CHANGELOG.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
0.42.0-beta8
2+
=============
3+
* Various improvements:
4+
* Existing Builders were replaced with DataFactories in Customer and Tax modules
5+
* Refactored controller actions in the Checkout and CMS modules
6+
* Increased coverage with static tests for `.phtml` files
7+
* Moved Cookie related functionality from `Theme` and `Core` modules into a new `Cookie` module
8+
* Moved minfication configuration settings to the `View` library level
9+
* UI improvements:
10+
* Restyled installation wizard
11+
* Prepared styles for Dashboard in the Backend area
12+
* Framework improvements:
13+
* Added `setCustomAttribute` and `setCustomAttributes` methods to `ExtensibleDataInterface`
14+
* Added setter methods to data object interfaces
15+
* Replaced `Builders` with `Factories`
16+
* Added `DataObjectHelper.php` which contains the common set of methods of all builders
17+
* Refactored `__()` to return `Phrase` object
18+
* Allowed usage of `LocalizedException` on the framework's library level
19+
* Added expiration/lifetime management of frontend resources
20+
* Unified MTF configurations format for Framework, TestCase variations and TestCase scenario configurations
21+
* Fixed bugs:
22+
* Fixed an issue with product reviews list paging
23+
* Fixed an issue where sold products were not displayed in Bestsellers
24+
* Fixed an issue with image rendering on the CMS page on Frontend when `webserver rewrites = no`
25+
* GitHub requests:
26+
* [#790](https://github.com/magento/magento2/issues/790) -- Magento API fails in a CGI env (zf1 issue)
27+
* [#909](https://github.com/magento/magento2/issues/909) -- Manage Titles in popup window front-end issue
28+
* [#996](https://github.com/magento/magento2/issues/996) -- Pager block should support url "fragment".
29+
* [#985](https://github.com/magento/magento2/pull/985) -- Allow camelcase in vendorname for menus
30+
* [#1025](https://github.com/magento/magento2/pull/1025) -- Wrong parameter for getting base url for 'media' path in "Image" form element.
31+
132
0.42.0-beta7
233
=============
334
* Various improvements:

‎app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

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

99
namespace Magento\AdminNotification\Model\System\Message;
1010

11+
use Magento\Store\Model\Store;
12+
1113
class Baseurl implements \Magento\Framework\Notification\MessageInterface
1214
{
1315
/**
@@ -56,9 +58,9 @@ public function __construct(
5658
protected function _getConfigUrl()
5759
{
5860
$output = '';
59-
$defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
61+
$defaultUnsecure = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
6062

61-
$defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
63+
$defaultSecure = $this->_config->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
6264

6365
if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
6466
$defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

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

99
namespace Magento\AdminNotification\Model\System\Message;
1010

11+
use Magento\Store\Model\Store;
12+
1113
class Security implements \Magento\Framework\Notification\MessageInterface
1214
{
1315
/**
@@ -93,7 +95,7 @@ private function _canShowNotification()
9395
*/
9496
private function _isFileAccessible()
9597
{
96-
$unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
98+
$unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
9799

98100
/** @var $http \Magento\Framework\HTTP\Adapter\Curl */
99101
$http = $this->_curlFactory->create();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta7",
7-
"magento/module-core": "0.42.0-beta7",
8-
"magento/module-backend": "0.42.0-beta7",
9-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-store": "0.42.0-beta8",
7+
"magento/module-core": "0.42.0-beta8",
8+
"magento/module-backend": "0.42.0-beta8",
9+
"magento/framework": "0.42.0-beta8",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta7",
14+
"version": "0.42.0-beta8",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta7",
7-
"magento/framework": "0.42.0-beta7",
6+
"magento/module-backend": "0.42.0-beta8",
7+
"magento/framework": "0.42.0-beta8",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta7",
11+
"version": "0.42.0-beta8",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
7272
protected $_canUseBaseUrl;
7373

7474
/**
75-
* @var \Magento\Core\App\Action\FormKeyValidator
75+
* @var \Magento\Framework\Data\Form\FormKey\Validator
7676
*/
7777
protected $_formKeyValidator;
7878

‎app/code/Magento/Backend/App/Action/Context.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\App\Action\Context
3232
protected $_backendUrl;
3333

3434
/**
35-
* @var \Magento\Core\App\Action\FormKeyValidator
35+
* @var \Magento\Framework\Data\Form\FormKey\Validator
3636
*/
3737
protected $_formKeyValidator;
3838

@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\App\Action\Context
6666
* @param \Magento\Backend\Model\Auth $auth
6767
* @param \Magento\Backend\Helper\Data $helper
6868
* @param \Magento\Backend\Model\UrlInterface $backendUrl
69-
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
69+
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
7070
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
7171
* @param bool $canUseBaseUrl
7272
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
8686
\Magento\Backend\Model\Auth $auth,
8787
\Magento\Backend\Helper\Data $helper,
8888
\Magento\Backend\Model\UrlInterface $backendUrl,
89-
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
89+
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
9090
\Magento\Framework\Locale\ResolverInterface $localeResolver,
9191
$canUseBaseUrl = false
9292
) {
@@ -146,7 +146,7 @@ public function getCanUseBaseUrl()
146146
}
147147

148148
/**
149-
* @return \Magento\Core\App\Action\FormKeyValidator
149+
* @return \Magento\Framework\Data\Form\FormKey\Validator
150150
*/
151151
public function getFormKeyValidator()
152152
{

‎app/code/Magento/Backend/App/Router.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
namespace Magento\Backend\App;
1010

11-
class Router extends \Magento\Core\App\Router\Base
11+
class Router extends \Magento\Framework\App\Router\Base
1212
{
1313
/**
1414
* @var \Magento\Backend\App\ConfigInterface
@@ -53,11 +53,9 @@ class Router extends \Magento\Core\App\Router\Base
5353
* @param \Magento\Framework\App\ResponseFactory $responseFactory
5454
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
5555
* @param \Magento\Framework\UrlInterface $url
56-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
57-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
58-
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
5956
* @param string $routerId
6057
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
58+
* @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
6159
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
6260
* @param \Magento\Backend\App\ConfigInterface $backendConfig
6361
*
@@ -70,11 +68,9 @@ public function __construct(
7068
\Magento\Framework\App\ResponseFactory $responseFactory,
7169
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
7270
\Magento\Framework\UrlInterface $url,
73-
\Magento\Store\Model\StoreManagerInterface $storeManager,
74-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
75-
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
7671
$routerId,
7772
\Magento\Framework\Code\NameBuilder $nameBuilder,
73+
\Magento\Framework\App\Router\PathConfigInterface $pathConfig,
7874
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
7975
\Magento\Backend\App\ConfigInterface $backendConfig
8076
) {
@@ -85,11 +81,9 @@ public function __construct(
8581
$responseFactory,
8682
$routeConfig,
8783
$url,
88-
$storeManager,
89-
$scopeConfig,
90-
$urlSecurityInfo,
9184
$routerId,
92-
$nameBuilder
85+
$nameBuilder,
86+
$pathConfig
9387
);
9488
$this->_coreConfig = $coreConfig;
9589
$this->_backendConfig = $backendConfig;

‎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

0 commit comments

Comments
 (0)