Skip to content

Commit 158d8f9

Browse files
author
Dale Sikkema
committed
Merge branch 'MAGETWO-31495-core-app' into develop
Conflicts: app/code/Magento/Newsletter/composer.json app/code/Magento/Review/composer.json app/code/Magento/Sendfriend/composer.json
2 parents a9868da + 6505ac2 commit 158d8f9

File tree

65 files changed

+430
-313
lines changed

Some content is hidden

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

65 files changed

+430
-313
lines changed

‎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/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 & 8 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,10 @@ 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\Framework\Store\StoreManagerInterface $storeManager
5756
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
58-
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
5957
* @param string $routerId
6058
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
59+
* @param \Magento\Framework\App\Router\SecureUrlInterface $secureUrl
6160
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
6261
* @param \Magento\Backend\App\ConfigInterface $backendConfig
6362
*
@@ -70,11 +69,10 @@ public function __construct(
7069
\Magento\Framework\App\ResponseFactory $responseFactory,
7170
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
7271
\Magento\Framework\UrlInterface $url,
73-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
7472
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
75-
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
7673
$routerId,
7774
\Magento\Framework\Code\NameBuilder $nameBuilder,
75+
\Magento\Framework\App\Router\SecureUrlInterface $secureUrl,
7876
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
7977
\Magento\Backend\App\ConfigInterface $backendConfig
8078
) {
@@ -85,11 +83,10 @@ public function __construct(
8583
$responseFactory,
8684
$routeConfig,
8785
$url,
88-
$storeManager,
8986
$scopeConfig,
90-
$urlSecurityInfo,
9187
$routerId,
92-
$nameBuilder
88+
$nameBuilder,
89+
$secureUrl
9390
);
9491
$this->_coreConfig = $coreConfig;
9592
$this->_backendConfig = $backendConfig;

‎app/code/Magento/Backend/Model/Config/Backend/Baseurl.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Backend\Model\Config\Backend;
77

8+
use Magento\Framework\Store\StoreManagerInterface;
9+
810
class Baseurl extends \Magento\Framework\App\Config\Value
911
{
1012
/**

‎app/code/Magento/Catalog/Controller/Product/Compare.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Catalog\Controller\Product;
77

88
use Magento\Catalog\Api\ProductRepositoryInterface;
9-
use Magento\Core\App\Action\FormKeyValidator;
9+
use Magento\Framework\Data\Form\FormKey\Validator;
1010
use Magento\Framework\Controller\Result;
1111
use Magento\Framework\View\Result\PageFactory;
1212

@@ -73,7 +73,7 @@ class Compare extends \Magento\Framework\App\Action\Action
7373
protected $_storeManager;
7474

7575
/**
76-
* @var FormKeyValidator
76+
* @var Validator
7777
*/
7878
protected $_formKeyValidator;
7979

@@ -103,7 +103,7 @@ class Compare extends \Magento\Framework\App\Action\Action
103103
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
104104
* @param \Magento\Catalog\Model\Session $catalogSession
105105
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
106-
* @param FormKeyValidator $formKeyValidator
106+
* @param Validator $formKeyValidator
107107
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
108108
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
109109
* @param ProductRepositoryInterface $productRepository
@@ -118,7 +118,7 @@ public function __construct(
118118
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
119119
\Magento\Catalog\Model\Session $catalogSession,
120120
\Magento\Framework\Store\StoreManagerInterface $storeManager,
121-
FormKeyValidator $formKeyValidator,
121+
Validator $formKeyValidator,
122122
Result\RedirectFactory $resultRedirectFactory,
123123
PageFactory $resultPageFactory,
124124
ProductRepositoryInterface $productRepository

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\Catalog\Controller\Product\Compare;
88

99
use Magento\Catalog\Api\ProductRepositoryInterface;
10-
use Magento\Core\App\Action\FormKeyValidator;
10+
use Magento\Framework\Data\Form\FormKey\Validator;
1111
use Magento\Framework\Controller\Result;
1212
use Magento\Framework\View\Result\PageFactory;
1313

@@ -30,7 +30,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
3030
* @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
3131
* @param \Magento\Catalog\Model\Session $catalogSession
3232
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
33-
* @param FormKeyValidator $formKeyValidator
33+
* @param Validator $formKeyValidator
3434
* @param Result\RedirectFactory $resultRedirectFactory
3535
* @param PageFactory $resultPageFactory
3636
* @param ProductRepositoryInterface $productRepository
@@ -47,7 +47,7 @@ public function __construct(
4747
\Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
4848
\Magento\Catalog\Model\Session $catalogSession,
4949
\Magento\Framework\Store\StoreManagerInterface $storeManager,
50-
FormKeyValidator $formKeyValidator,
50+
Validator $formKeyValidator,
5151
Result\RedirectFactory $resultRedirectFactory,
5252
PageFactory $resultPageFactory,
5353
ProductRepositoryInterface $productRepository,

‎app/code/Magento/Checkout/Controller/Cart.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
2929
protected $_storeManager;
3030

3131
/**
32-
* @var \Magento\Core\App\Action\FormKeyValidator
32+
* @var \Magento\Framework\Data\Form\FormKey\Validator
3333
*/
3434
protected $_formKeyValidator;
3535

@@ -43,15 +43,15 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
4343
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4444
* @param \Magento\Checkout\Model\Session $checkoutSession
4545
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
46-
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
46+
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
4747
* @param CustomerCart $cart
4848
*/
4949
public function __construct(
5050
\Magento\Framework\App\Action\Context $context,
5151
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
5252
\Magento\Checkout\Model\Session $checkoutSession,
5353
\Magento\Framework\Store\StoreManagerInterface $storeManager,
54-
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
54+
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
5555
CustomerCart $cart
5656
) {
5757
$this->_formKeyValidator = $formKeyValidator;

‎app/code/Magento/Checkout/Controller/Cart/Add.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Add extends \Magento\Checkout\Controller\Cart
2828
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
2929
* @param \Magento\Checkout\Model\Session $checkoutSession
3030
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
31-
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
31+
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
3232
* @param CustomerCart $cart
3333
* @param ProductRepositoryInterface $productRepository
3434
*/
@@ -37,7 +37,7 @@ public function __construct(
3737
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
3838
\Magento\Checkout\Model\Session $checkoutSession,
3939
\Magento\Framework\Store\StoreManagerInterface $storeManager,
40-
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
40+
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
4141
CustomerCart $cart,
4242
ProductRepositoryInterface $productRepository
4343
) {

0 commit comments

Comments
 (0)