diff --git a/app/code/Magento/Authorizenet/Block/Directpost/Form.php b/app/code/Magento/Authorizenet/Block/Directpost/Form.php
index 3c327bcd36e84..a7c619f98ca57 100644
--- a/app/code/Magento/Authorizenet/Block/Directpost/Form.php
+++ b/app/code/Magento/Authorizenet/Block/Directpost/Form.php
@@ -48,22 +48,20 @@ class Form extends \Magento\Payment\Block\Form\Cc
protected $_checkoutModel;
/**
- * @param \Magento\View\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\View\Element\Template\Context $context
* @param \Magento\Payment\Model\Config $paymentConfig
* @param \Magento\Authorizenet\Model\Directpost $model
* @param \Magento\Checkout\Model\Type\Onepage $checkoutModel
* @param array $data
*/
public function __construct(
- \Magento\View\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
+ \Magento\View\Element\Template\Context $context,
\Magento\Payment\Model\Config $paymentConfig,
\Magento\Authorizenet\Model\Directpost $model,
\Magento\Checkout\Model\Type\Onepage $checkoutModel,
array $data = array()
) {
- parent::__construct($context, $coreData, $paymentConfig, $data);
+ parent::__construct($context, $paymentConfig, $data);
$this->_model = $model;
$this->_checkoutModel = $checkoutModel;
}
diff --git a/app/code/Magento/Authorizenet/Block/Directpost/Iframe.php b/app/code/Magento/Authorizenet/Block/Directpost/Iframe.php
index b5e66559d38b3..77dbcf0d00ebd 100644
--- a/app/code/Magento/Authorizenet/Block/Directpost/Iframe.php
+++ b/app/code/Magento/Authorizenet/Block/Directpost/Iframe.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Authorizenet\Block\Directpost;
-class Iframe extends \Magento\View\Block\Template
+class Iframe extends \Magento\View\Element\Template
{
/**
* Core registry
@@ -43,19 +43,17 @@ class Iframe extends \Magento\View\Block\Template
protected $_coreRegistry = null;
/**
- * @param \Magento\View\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\View\Element\Template\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param array $data
*/
public function __construct(
- \Magento\View\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
+ \Magento\View\Element\Template\Context $context,
\Magento\Core\Model\Registry $registry,
array $data = array()
) {
$this->_coreRegistry = $registry;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
@@ -63,7 +61,7 @@ public function __construct(
*
* You can redefine this method in child classes for changing layout
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
index 668acee53e7a4..f9a951dd5bb4a 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php
@@ -204,9 +204,9 @@ public function redirectAction()
}
}
//clear sessions
- $this->_getSession()->clear();
+ $this->_getSession()->clearStorage();
$this->_getDirectPostSession()->removeCheckoutOrderIncrementId($redirectParams['x_invoice_num']);
- $this->_objectManager->get('Magento\Adminhtml\Model\Session')->clear();
+ $this->_objectManager->get('Magento\Adminhtml\Model\Session')->clearStorage();
$this->_objectManager->get('Magento\Adminhtml\Model\Session')->addSuccess(__('You created the order.'));
}
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Observer.php b/app/code/Magento/Authorizenet/Model/Directpost/Observer.php
index bf71c6b32293d..97b801df3667a 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Observer.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Observer.php
@@ -126,7 +126,7 @@ public function addAdditionalFieldsToResponseFrontend(\Magento\Event\Observer $o
if ($payment && $payment->getMethod() == $this->_modelFactory->create()->getCode()) {
$request = $observer->getEvent()->getRequest();
$response = $observer->getEvent()->getResponse();
- $result = $this->_coreData->jsonDecode($response->getBody('default'), \Zend_Json::TYPE_ARRAY);
+ $result = $this->_coreData->jsonDecode($response->getBody('default'));
if (empty($result['error'])) {
$payment = $order->getPayment();
diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Session.php b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
index 157f30132896a..778a9f409225e 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost/Session.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost/Session.php
@@ -37,16 +37,20 @@ class Session extends \Magento\Core\Model\Session\AbstractSession
{
/**
* @param \Magento\Core\Model\Session\Context $context
+ * @param \Magento\Session\SidResolverInterface $sidResolver
+ * @param \Magento\Session\Config\ConfigInterface $sessionConfig
* @param array $data
* @param string|null $sessionName
*/
public function __construct(
\Magento\Core\Model\Session\Context $context,
+ \Magento\Session\SidResolverInterface $sidResolver,
+ \Magento\Session\Config\ConfigInterface $sessionConfig,
array $data = array(),
$sessionName = null
) {
- parent::__construct($context, $data);
- $this->init('authorizenet_directpost', $sessionName);
+ parent::__construct($context, $sidResolver, $sessionConfig, $data);
+ $this->start('authorizenet_directpost', $sessionName);
}
/**
diff --git a/app/code/Magento/Authorizenet/etc/module.xml b/app/code/Magento/Authorizenet/etc/module.xml
index 2258e1dbfd381..efba0d75d9cdd 100755
--- a/app/code/Magento/Authorizenet/etc/module.xml
+++ b/app/code/Magento/Authorizenet/etc/module.xml
@@ -38,7 +38,7 @@
-
+
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml
index ffd10813b7833..6ea4c18e07e5a 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/layout/sales_order_create_index.xml
@@ -25,7 +25,7 @@
-->
-
+
mage/directpost.js
diff --git a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml
index 213ec8a08a1b5..fe7f665571913 100644
--- a/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml
+++ b/app/code/Magento/Authorizenet/view/frontend/layout/checkout_onepage_index.xml
@@ -25,7 +25,7 @@
-->
-
+
Magento_Authorizenet::js/directpost.js
diff --git a/app/code/Magento/Authz/Model/UserIdentifier.php b/app/code/Magento/Authz/Model/UserIdentifier.php
new file mode 100644
index 0000000000000..b26a6ddc58071
--- /dev/null
+++ b/app/code/Magento/Authz/Model/UserIdentifier.php
@@ -0,0 +1,130 @@
+getUserType();
+ $userId = isset($userId) ? $userId : $userLocator->getUserId();
+ if ($userType == self::USER_TYPE_GUEST && $userId) {
+ throw new \LogicException('Guest user must not have user ID set.');
+ }
+ $this->_setUserId($userId);
+ $this->_setUserType($userType);
+ }
+
+ /**
+ * Get user ID. Null is possible when user type is 'guest'.
+ *
+ * @return int
+ */
+ public function getUserId()
+ {
+ return $this->_userId;
+ }
+
+ /**
+ * Retrieve user type (admin, customer, guest, web API integration).
+ *
+ * @return string
+ */
+ public function getUserType()
+ {
+ return $this->_userType;
+ }
+
+ /**
+ * Set user ID.
+ *
+ * @param int
+ * @return UserIdentifier
+ * @throws \LogicException
+ */
+ protected function _setUserId($userId)
+ {
+ $userId = is_numeric($userId) ? (int)$userId : $userId;
+ if (!is_integer($userId) || ($userId < 0)) {
+ throw new \LogicException("Invalid user ID: '{$userId}'.");
+ }
+ $this->_userId = $userId;
+ return $this;
+ }
+
+ /**
+ * Set user type.
+ *
+ * @param string $userType
+ * @return UserIdentifier
+ * @throws \LogicException
+ */
+ protected function _setUserType($userType)
+ {
+ $availableTypes = array(
+ self::USER_TYPE_GUEST,
+ self::USER_TYPE_CUSTOMER,
+ self::USER_TYPE_ADMIN,
+ self::USER_TYPE_INTEGRATION
+ );
+ if (!in_array($userType, $availableTypes)) {
+ throw new \LogicException(
+ "Invalid user type: '{$userType}'. Allowed types: " . implode(", ", $availableTypes)
+ );
+ }
+ $this->_userType = $userType;
+ return $this;
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php b/app/code/Magento/Authz/Model/UserIdentifier/Factory.php
similarity index 55%
rename from dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php
rename to app/code/Magento/Authz/Model/UserIdentifier/Factory.php
index 5c916bf7a5113..19fcfecc6b14d 100644
--- a/dev/tests/integration/testsuite/Magento/Page/Helper/RobotsTest.php
+++ b/app/code/Magento/Authz/Model/UserIdentifier/Factory.php
@@ -18,39 +18,47 @@
* versions in the future. If you wish to customize Magento for your
* needs please refer to http://www.magentocommerce.com for more information.
*
- * @category Magento
- * @package Magento_Page
- * @subpackage integration_tests
* @copyright Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\Authz\Model\UserIdentifier;
+
+use Magento\ObjectManager;
+use Magento\Authz\Model\UserIdentifier;
+
/**
- * Test class for \Magento\Page\Helper\Robots
+ * User identifier factory.
*/
-namespace Magento\Page\Helper;
-
-class RobotsTest extends \PHPUnit_Framework_TestCase
+class Factory
{
/**
- * @var \Magento\Page\Helper\Robots
+ * @var \Magento\ObjectManager
*/
- protected $_helper;
+ protected $_objectManager;
- protected function setUp()
+ /**
+ * Initialize dependencies
+ *
+ * @param ObjectManager $objectManager
+ */
+ public function __construct(ObjectManager $objectManager)
{
- $this->_helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Page\Helper\Robots');
+ $this->_objectManager = $objectManager;
}
/**
- * @covers \Magento\Page\Helper\Robots::getRobotsDefaultCustomInstructions
+ * Create instance of user identifier.
+ *
+ * @param string $userType
+ * @param int $userId
+ * @return UserIdentifier
*/
- public function testGetRobotsDefaultCustomInstructions()
+ public function create($userType, $userId = 0)
{
- $this->assertStringEqualsFile(
- __DIR__ . '/../_files/robots.txt',
- $this->_helper->getRobotsDefaultCustomInstructions(),
- 'robots.txt default custom instructions are invalid'
+ return $this->_objectManager->create(
+ 'Magento\Authz\Model\UserIdentifier',
+ array('userType' => $userType, 'userId' => $userId)
);
}
}
diff --git a/app/code/Magento/Authz/Model/UserLocator/Admin.php b/app/code/Magento/Authz/Model/UserLocator/Admin.php
new file mode 100644
index 0000000000000..8cecd7ee730ac
--- /dev/null
+++ b/app/code/Magento/Authz/Model/UserLocator/Admin.php
@@ -0,0 +1,64 @@
+_adminSession = $adminSession;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getUserId()
+ {
+ return $this->_adminSession->hasUser() ? (int)$this->_adminSession->getUser()->getId() : 0;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getUserType()
+ {
+ return UserIdentifier::USER_TYPE_ADMIN;
+ }
+}
diff --git a/app/code/Magento/Authz/Model/UserLocator/Guest.php b/app/code/Magento/Authz/Model/UserLocator/Guest.php
new file mode 100644
index 0000000000000..f27cc69b75b07
--- /dev/null
+++ b/app/code/Magento/Authz/Model/UserLocator/Guest.php
@@ -0,0 +1,50 @@
+getUrl($this->getPath());
- }
+ public function getUserType();
}
diff --git a/app/code/Magento/Authz/Service/AuthorizationV1.php b/app/code/Magento/Authz/Service/AuthorizationV1.php
new file mode 100644
index 0000000000000..cce2256d61a24
--- /dev/null
+++ b/app/code/Magento/Authz/Service/AuthorizationV1.php
@@ -0,0 +1,254 @@
+_aclBuilder = $aclBuilder;
+ $this->_userIdentifier = $userIdentifier;
+ $this->_roleFactory = $roleFactory;
+ $this->_rulesFactory = $rulesFactory;
+ $this->_rulesCollectionFactory = $rulesCollectionFactory;
+ $this->_roleCollectionFactory = $roleCollectionFactory;
+ $this->_logger = $logger;
+ $this->_rootAclResource = $rootAclResource;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isAllowed($resources, UserIdentifier $userIdentifier = null)
+ {
+ $resources = is_array($resources) ? $resources : array($resources);
+ $userIdentifier = $userIdentifier ? $userIdentifier : $this->_userIdentifier;
+ try {
+ $role = $this->_getUserRole($userIdentifier);
+ if (!$role) {
+ throw new ResourceNotFoundException(
+ __(
+ 'Role for user with ID "%1" and user type "%2" cannot be found.',
+ $userIdentifier->getUserId(),
+ $userIdentifier->getUserType()
+ )
+ );
+ }
+ foreach ($resources as $resource) {
+ if (!$this->_aclBuilder->getAcl()->isAllowed($role->getId(), $resource)) {
+ return false;
+ }
+ }
+ return true;
+ } catch (\Exception $e) {
+ $this->_logger->logException($e);
+ return false;
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function grantPermissions(UserIdentifier $userIdentifier, array $resources)
+ {
+ try {
+ $role = $this->_getUserRole($userIdentifier);
+ if (!$role) {
+ $role = $this->_createRole($userIdentifier);
+ }
+ $this->_associateResourcesWithRole($role, $resources);
+ } catch (ServiceException $e) {
+ throw $e;
+ } catch (\Exception $e) {
+ $this->_logger->logException($e);
+ throw new ServiceException(
+ __('Error happened while granting permissions. Check exception log for details.')
+ );
+ }
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function grantAllPermissions(UserIdentifier $userIdentifier)
+ {
+ $this->grantPermissions($userIdentifier, array($this->_rootAclResource->getId()));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getAllowedResources(UserIdentifier $userIdentifier)
+ {
+ $allowedResources = array();
+ try {
+ $role = $this->_getUserRole($userIdentifier);
+ if (!$role) {
+ throw new ServiceException(__('The role associated with the specified user cannot be found.'));
+ }
+ $rulesCollection = $this->_rulesCollectionFactory->create();
+ $rulesCollection->getByRoles($role->getId())->load();
+ $acl = $this->_aclBuilder->getAcl();
+ /** @var \Magento\User\Model\Rules $ruleItem */
+ foreach ($rulesCollection->getItems() as $ruleItem) {
+ $resourceId = $ruleItem->getResourceId();
+ if ($acl->has($resourceId) && $acl->isAllowed($role->getId(), $resourceId)) {
+ $allowedResources[] = $resourceId;
+ }
+ }
+ } catch (ServiceException $e) {
+ throw $e;
+ } catch (\Exception $e) {
+ $this->_logger->logException($e);
+ throw new ServiceException(
+ __('Error happened while getting a list of allowed resources. Check exception log for details.')
+ );
+ }
+ return $allowedResources;
+ }
+
+ /**
+ * Create new ACL role.
+ *
+ * @param UserIdentifier $userIdentifier
+ * @return Role
+ * @throws \LogicException
+ */
+ protected function _createRole($userIdentifier)
+ {
+ $userType = $userIdentifier->getUserType();
+ $userId = $userIdentifier->getUserId();
+ switch ($userType) {
+ case UserIdentifier::USER_TYPE_INTEGRATION:
+ $roleName = $userType . $userId;
+ $roleType = \Magento\User\Model\Acl\Role\User::ROLE_TYPE;
+ $parentId = 0;
+ $userId = $userIdentifier->getUserId();
+ break;
+ default:
+ throw new \LogicException("Unknown user type: '{$userType}'.");
+ }
+ $role = $this->_roleFactory->create();
+ $role->setRoleName($roleName)
+ ->setUserType($userType)
+ ->setUserId($userId)
+ ->setRoleType($roleType)
+ ->setParentId($parentId)
+ ->save();
+ return $role;
+ }
+
+ /**
+ * Identify user role from user identifier.
+ *
+ * @param UserIdentifier $userIdentifier
+ * @return Role|false Return false in case when no role associated with provided user was found.
+ */
+ protected function _getUserRole($userIdentifier)
+ {
+ $roleCollection = $this->_roleCollectionFactory->create();
+ $userType = $userIdentifier->getUserType();
+ $userId = $userIdentifier->getUserId();
+ /** @var Role $role */
+ $role = $roleCollection->setUserFilter($userId, $userType)->getFirstItem();
+ return $role->getId() ? $role : false;
+ }
+
+ /**
+ * Associate resources with the specified role. All resources previously assigned to the role will be unassigned.
+ *
+ * @param Role $role
+ * @param string[] $resources
+ */
+ protected function _associateResourcesWithRole($role, array $resources)
+ {
+ /** @var \Magento\User\Model\Rules $rules */
+ $rules = $this->_rulesFactory->create();
+ $rules->setRoleId($role->getId())->setResources($resources)->saveRel();
+ }
+}
diff --git a/app/code/Magento/Authz/Service/AuthorizationV1Interface.php b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php
new file mode 100644
index 0000000000000..02b6f60d2c140
--- /dev/null
+++ b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php
@@ -0,0 +1,72 @@
+
+
+
+
+
diff --git a/app/code/Magento/Authz/etc/di.xml b/app/code/Magento/Authz/etc/di.xml
new file mode 100644
index 0000000000000..4dbaf698ee87b
--- /dev/null
+++ b/app/code/Magento/Authz/etc/di.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Page/etc/module.xml b/app/code/Magento/Authz/etc/module.xml
old mode 100755
new mode 100644
similarity index 79%
rename from app/code/Magento/Page/etc/module.xml
rename to app/code/Magento/Authz/etc/module.xml
index cc66376f9c66d..91159766258e5
--- a/app/code/Magento/Page/etc/module.xml
+++ b/app/code/Magento/Authz/etc/module.xml
@@ -24,15 +24,11 @@
*/
-->
-
-
-
-
+
-
-
-
+
+
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 308a1c84d8479..58259d8b1fe21 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -166,28 +166,28 @@ protected function _addBreadcrumb($label, $title, $link=null)
}
/**
- * @param \Magento\View\Block\AbstractBlock $block
+ * @param \Magento\View\Element\AbstractBlock $block
* @return \Magento\Backend\App\AbstractAction
*/
- protected function _addContent(\Magento\View\Block\AbstractBlock $block)
+ protected function _addContent(\Magento\View\Element\AbstractBlock $block)
{
return $this->_moveBlockToContainer($block, 'content');
}
/**
- * @param \Magento\View\Block\AbstractBlock $block
+ * @param \Magento\View\Element\AbstractBlock $block
* @return \Magento\Backend\App\AbstractAction
*/
- protected function _addLeft(\Magento\View\Block\AbstractBlock $block)
+ protected function _addLeft(\Magento\View\Element\AbstractBlock $block)
{
return $this->_moveBlockToContainer($block, 'left');
}
/**
- * @param \Magento\View\Block\AbstractBlock $block
+ * @param \Magento\View\Element\AbstractBlock $block
* @return \Magento\Backend\App\AbstractAction
*/
- protected function _addJs(\Magento\View\Block\AbstractBlock $block)
+ protected function _addJs(\Magento\View\Element\AbstractBlock $block)
{
return $this->_moveBlockToContainer($block, 'js');
}
@@ -197,11 +197,11 @@ protected function _addJs(\Magento\View\Block\AbstractBlock $block)
*
* The block will be moved to the container from previous parent after all other elements
*
- * @param \Magento\View\Block\AbstractBlock $block
+ * @param \Magento\View\Element\AbstractBlock $block
* @param string $containerName
* @return \Magento\Backend\App\AbstractAction
*/
- private function _moveBlockToContainer(\Magento\View\Block\AbstractBlock $block, $containerName)
+ private function _moveBlockToContainer(\Magento\View\Element\AbstractBlock $block, $containerName)
{
$this->_view->getLayout()->setChild($containerName, $block->getNameInLayout(), '');
return $this;
@@ -218,9 +218,7 @@ public function dispatch(\Magento\App\RequestInterface $request)
}
if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
- $this->_forward('denied');
- $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
- return parent::dispatch($request);
+ return $this->_forward('denied');
}
if ($this->_isUrlChecked()) {
@@ -393,4 +391,4 @@ protected function _outTemplate($tplName, $data = array())
$this->_objectManager->get('Magento\Core\Model\Translate')->processResponseBody($html);
$this->getResponse()->setBody($html);
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Backend/App/Action/Context.php b/app/code/Magento/Backend/App/Action/Context.php
index 7774862ce1207..1eec150730b63 100644
--- a/app/code/Magento/Backend/App/Action/Context.php
+++ b/app/code/Magento/Backend/App/Action/Context.php
@@ -206,4 +206,4 @@ public function getSession()
{
return $this->_session;
}
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Backend/Block/AbstractBlock.php b/app/code/Magento/Backend/Block/AbstractBlock.php
index d2f15309be743..454167989a735 100644
--- a/app/code/Magento/Backend/Block/AbstractBlock.php
+++ b/app/code/Magento/Backend/Block/AbstractBlock.php
@@ -31,7 +31,7 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class AbstractBlock extends \Magento\View\Block\AbstractBlock
+class AbstractBlock extends \Magento\View\Element\AbstractBlock
{
/**
* @var \Magento\AuthorizationInterface
diff --git a/app/code/Magento/Backend/Block/Admin/Formkey.php b/app/code/Magento/Backend/Block/Admin/Formkey.php
index 0d5e6c6b70624..ec71ca7190895 100644
--- a/app/code/Magento/Backend/Block/Admin/Formkey.php
+++ b/app/code/Magento/Backend/Block/Admin/Formkey.php
@@ -38,6 +38,6 @@ class Formkey extends \Magento\Backend\Block\Template
*/
public function getFormKey()
{
- return $this->_session->getFormKey();
+ return $this->formKey->getFormKey();
}
}
diff --git a/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php b/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
index 5fbf20e5c8f90..bbe32dd6fc456 100644
--- a/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
+++ b/app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php
@@ -34,17 +34,15 @@ class Statuses extends \Magento\Backend\Block\Widget\Grid\Column
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param \Magento\App\Cache\TypeListInterface $cacheTypeList
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
\Magento\App\Cache\TypeListInterface $cacheTypeList,
array $data = array()
) {
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
$this->_cacheTypeList = $cacheTypeList;
}
diff --git a/app/code/Magento/Backend/Block/Context.php b/app/code/Magento/Backend/Block/Context.php
index 55880dc9e89c5..be933a5adb5a5 100644
--- a/app/code/Magento/Backend/Block/Context.php
+++ b/app/code/Magento/Backend/Block/Context.php
@@ -28,7 +28,7 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Context extends \Magento\View\Block\Context
+class Context extends \Magento\View\Element\Context
{
/**
* @var \Magento\AuthorizationInterface
@@ -44,6 +44,7 @@ class Context extends \Magento\View\Block\Context
* @param \Magento\App\CacheInterface $cache
* @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Session\AbstractSession $session
+ * @param \Magento\Session\SidResolverInterface $sidResolver
* @param \Magento\Core\Model\Store\Config $storeConfig
* @param \Magento\App\FrontController $frontController
* @param \Magento\App\Helper\HelperFactory $helperFactory
@@ -57,7 +58,7 @@ class Context extends \Magento\View\Block\Context
* @param \Magento\Filter\FilterManager $filterManager
* @param \Magento\Core\Model\LocaleInterface $locale
* @param array $data
- *
+ *
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -69,6 +70,7 @@ public function __construct(
\Magento\App\CacheInterface $cache,
\Magento\View\DesignInterface $design,
\Magento\Core\Model\Session\AbstractSession $session,
+ \Magento\Session\SidResolverInterface $sidResolver,
\Magento\Core\Model\Store\Config $storeConfig,
\Magento\App\FrontController $frontController,
\Magento\App\Helper\HelperFactory $helperFactory,
@@ -84,9 +86,28 @@ public function __construct(
array $data = array()
) {
$this->_authorization = $authorization;
- parent::__construct($request, $layout, $eventManager, $urlBuilder, $translator, $cache, $design,
- $session, $storeConfig, $frontController, $helperFactory, $viewUrl, $viewConfig, $cacheState, $logger, $app,
- $escaper, $filterManager, $locale, $data
+ parent::__construct(
+ $request,
+ $layout,
+ $eventManager,
+ $urlBuilder,
+ $translator,
+ $cache,
+ $design,
+ $session,
+ $sidResolver,
+ $storeConfig,
+ $frontController,
+ $helperFactory,
+ $viewUrl,
+ $viewConfig,
+ $cacheState,
+ $logger,
+ $app,
+ $escaper,
+ $filterManager,
+ $locale,
+ $data
);
}
diff --git a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
index 123848b6717a7..ef09ab5fc0844 100644
--- a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
@@ -43,20 +43,18 @@ abstract class AbstractDashboard extends \Magento\Adminhtml\Block\Widget
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
public function getCollection()
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index 797aaec69a2ac..ee642713d2155 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -120,22 +120,20 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
*/
protected $_dashboardData = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
- * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param \Magento\Backend\Helper\Dashboard\Data $dashboardData
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
- \Magento\Backend\Helper\Dashboard\Data $dashboardData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ \Magento\Backend\Helper\Dashboard\Data $dashboardData,
+ array $data = array()
+ ) {
$this->_dashboardData = $dashboardData;
- parent::__construct($context, $coreData, $collectionFactory, $data);
+ parent::__construct($context, $collectionFactory, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index 05cd859d92c44..e2225b40488c6 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -41,22 +41,28 @@ class Grid extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Module\Manager $moduleManager,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
+ $this->_moduleManager = $moduleManager;
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
@@ -67,7 +73,7 @@ protected function _construct()
protected function _prepareCollection()
{
- if (!$this->_coreData->isModuleEnabled('Magento_Reports')) {
+ if (!$this->_moduleManager->isEnabled('Magento_Reports')) {
return $this;
}
$collection = $this->_collectionFactory->create()
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index 48893c077f2bd..a5366e2fe25b3 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -34,13 +34,36 @@
namespace Magento\Backend\Block\Dashboard;
+use Magento\Adminhtml\Block\Widget;
+
class Sales extends \Magento\Backend\Block\Dashboard\Bar
{
protected $_template = 'dashboard/salebar.phtml';
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ \Magento\Module\Manager $moduleManager,
+ array $data = array()
+ ) {
+ $this->_moduleManager = $moduleManager;
+ parent::__construct($context, $collectionFactory, $data);
+ }
+
protected function _prepareLayout()
{
- if (!$this->_coreData->isModuleEnabled('Magento_Reports')) {
+ if (!$this->_moduleManager->isEnabled('Magento_Reports')) {
return $this;
}
$isFilter = $this->getRequest()->getParam('store')
diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
index c340713e2b231..e6e83587bf9c2 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Last.php
@@ -43,22 +43,28 @@ class Last extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_queriesFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory
- * @param array $data
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Module\Manager $moduleManager,
+ \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory,
+ array $data = array()
+ ) {
+ $this->_moduleManager = $moduleManager;
$this->_queriesFactory = $queriesFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
@@ -69,7 +75,7 @@ protected function _construct()
protected function _prepareCollection()
{
- if (!$this->_coreData->isModuleEnabled('Magento_CatalogSearch')) {
+ if (!$this->_moduleManager->isEnabled('Magento_CatalogSearch')) {
return parent::_prepareCollection();
}
$this->_collection = $this->_queriesFactory->create();
diff --git a/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php b/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
index a525d9e837227..2205271431890 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Searches/Top.php
@@ -43,22 +43,28 @@ class Top extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_queriesFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory
- * @param array $data
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Module\Manager $moduleManager,
+ \Magento\CatalogSearch\Model\Resource\Query\CollectionFactory $queriesFactory,
+ array $data = array()
+ ) {
+ $this->_moduleManager = $moduleManager;
$this->_queriesFactory = $queriesFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
@@ -69,7 +75,7 @@ protected function _construct()
protected function _prepareCollection()
{
- if (!$this->_coreData->isModuleEnabled('Magento_CatalogSearch')) {
+ if (!$this->_moduleManager->isEnabled('Magento_CatalogSearch')) {
return parent::_prepareCollection();
}
$this->_collection = $this->_queriesFactory->create();
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
index 86fe59f32fe07..1c0f19b593c2a 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php
@@ -41,22 +41,20 @@ class Most extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
index 237218ec3db66..82289d9f94d09 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php
@@ -41,22 +41,20 @@ class Newest extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Reports\Model\Resource\Customer\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Reports\Model\Resource\Customer\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Reports\Model\Resource\Customer\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Reports\Model\Resource\Customer\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
index 24166c3530e56..d93d9c02b117b 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php
@@ -41,22 +41,28 @@ class Ordered extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Sales\Model\Resource\Report\Bestsellers\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Sales\Model\Resource\Report\Bestsellers\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Sales\Model\Resource\Report\Bestsellers\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Module\Manager $moduleManager,
+ \Magento\Sales\Model\Resource\Report\Bestsellers\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ $this->_moduleManager = $moduleManager;
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
@@ -67,7 +73,7 @@ protected function _construct()
protected function _prepareCollection()
{
- if (!$this->_coreData->isModuleEnabled('Magento_Sales')) {
+ if (!$this->_moduleManager->isEnabled('Magento_Sales')) {
return $this;
}
if ($this->getParam('website')) {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
index ac246a749d41e..a1298bdac49cf 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php
@@ -41,22 +41,20 @@ class Viewed extends \Magento\Backend\Block\Dashboard\Grid
*/
protected $_productsFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Url $urlModel
- * @param \Magento\Reports\Model\Resource\Product\CollectionFactory $productsFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Url $urlModel
+ * @param \Magento\Reports\Model\Resource\Product\CollectionFactory $productsFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Url $urlModel,
- \Magento\Reports\Model\Resource\Product\CollectionFactory $productsFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Url $urlModel,
+ \Magento\Reports\Model\Resource\Product\CollectionFactory $productsFactory,
+ array $data = array()
+ ) {
$this->_productsFactory = $productsFactory;
- parent::__construct($context, $coreData, $urlModel, $data);
+ parent::__construct($context, $urlModel, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index 3f6879a491ebd..6fdbcad87a007 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -34,13 +34,36 @@
*/
namespace Magento\Backend\Block\Dashboard;
+use Magento\Adminhtml\Block\Widget;
+
class Totals extends \Magento\Backend\Block\Dashboard\Bar
{
protected $_template = 'dashboard/totalbar.phtml';
+ /**
+ * @var \Magento\Module\Manager
+ */
+ protected $_moduleManager;
+
+ /**
+ * @param \Magento\Module\Manager $moduleManager
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Reports\Model\Resource\Order\CollectionFactory $collectionFactory,
+ \Magento\Module\Manager $moduleManager,
+ array $data = array()
+ ) {
+ $this->_moduleManager = $moduleManager;
+ parent::__construct($context, $collectionFactory, $data);
+ }
+
protected function _prepareLayout()
{
- if (!$this->_coreData->isModuleEnabled('Magento_Reports')) {
+ if (!$this->_moduleManager->isEnabled('Magento_Reports')) {
return $this;
}
$isFilter = $this->getRequest()->getParam('store')
diff --git a/app/code/Magento/Backend/Block/Denied.php b/app/code/Magento/Backend/Block/Denied.php
index 8de1d49d47587..9070dc570f8e3 100644
--- a/app/code/Magento/Backend/Block/Denied.php
+++ b/app/code/Magento/Backend/Block/Denied.php
@@ -33,20 +33,18 @@ class Denied extends \Magento\Backend\Block\Template
*/
protected $_authSession;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Auth\Session $authSession,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ array $data = array()
+ ) {
$this->_authSession = $authSession;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
public function hasAvailableResources()
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
index 19418d994a029..8a393e0590302 100644
--- a/app/code/Magento/Backend/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -48,18 +48,16 @@ class Uploader extends \Magento\Adminhtml\Block\Widget
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param \Magento\File\Size $fileSize
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
\Magento\File\Size $fileSize,
array $data = array()
) {
$this->_fileSizeService = $fileSize;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
protected function _construct()
@@ -109,7 +107,7 @@ protected function _prepareLayout()
if ($head) {
$head->addChild(
'jquery-fileUploader-css-jquery-fileupload-ui-css',
- 'Magento\Page\Block\Html\Head\Css',
+ 'Magento\Theme\Block\Html\Head\Css',
array(
'file' => 'jquery/fileUploader/css/jquery.fileupload-ui.css'
)
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index d7e946f5d270b..2897995077c6c 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -75,29 +75,27 @@ class Menu extends \Magento\Backend\Block\Template
*/
protected $_menuConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Url $url
- * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\Backend\Model\Menu\Config $menuConfig
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Url $url
+ * @param \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param \Magento\Backend\Model\Menu\Config $menuConfig
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Url $url,
- \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory,
- \Magento\Backend\Model\Auth\Session $authSession,
- \Magento\Backend\Model\Menu\Config $menuConfig,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Url $url,
+ \Magento\Backend\Model\Menu\Filter\IteratorFactory $iteratorFactory,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ \Magento\Backend\Model\Menu\Config $menuConfig,
+ array $data = array()
+ ) {
$this->_url = $url;
$this->_iteratorFactory = $iteratorFactory;
$this->_authSession = $authSession;
$this->_menuConfig = $menuConfig;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/Page/Head.php b/app/code/Magento/Backend/Block/Page/Head.php
index db71c6f792b87..96505249f40d9 100644
--- a/app/code/Magento/Backend/Block/Page/Head.php
+++ b/app/code/Magento/Backend/Block/Page/Head.php
@@ -33,7 +33,7 @@
*/
namespace Magento\Backend\Block\Page;
-class Head extends \Magento\Page\Block\Html\Head
+class Head extends \Magento\Theme\Block\Html\Head
{
/**
* @var string
@@ -46,34 +46,39 @@ class Head extends \Magento\Page\Block\Html\Head
protected $_titles;
/**
- * @param \Magento\View\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
+ * @var \Magento\Data\Form\FormKey
+ */
+ protected $formKey;
+
+ /**
+ * @param \Magento\View\Element\Template\Context $context
* @param \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase
* @param \Magento\ObjectManager $objectManager
- * @param \Magento\Core\Model\Page $page
- * @param \Magento\Core\Model\Page\Asset\MergeService $assetMergeService
- * @param \Magento\Core\Model\Page\Asset\MinifyService $assetMinifyService
+ * @param \Magento\View\Asset\GroupedCollection $assets
+ * @param \Magento\View\Asset\MergeService $assetMergeService
+ * @param \Magento\View\Asset\MinifyService $assetMinifyService
* @param \Magento\App\Action\Title $titles
+ * @param \Magento\Data\Form\FormKey $formKey
* @param array $data
*/
public function __construct(
- \Magento\View\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
+ \Magento\View\Element\Template\Context $context,
\Magento\Core\Helper\File\Storage\Database $fileStorageDatabase,
\Magento\ObjectManager $objectManager,
- \Magento\Core\Model\Page $page,
- \Magento\Core\Model\Page\Asset\MergeService $assetMergeService,
- \Magento\Core\Model\Page\Asset\MinifyService $assetMinifyService,
+ \Magento\View\Asset\GroupedCollection $assets,
+ \Magento\View\Asset\MergeService $assetMergeService,
+ \Magento\View\Asset\MinifyService $assetMinifyService,
\Magento\App\Action\Title $titles,
+ \Magento\Data\Form\FormKey $formKey,
array $data = array()
) {
$this->_titles = $titles;
+ $this->formKey = $formKey;
parent::__construct(
$context,
- $coreData,
$fileStorageDatabase,
$objectManager,
- $page,
+ $assets,
$assetMergeService,
$assetMinifyService,
$data
@@ -87,7 +92,7 @@ public function __construct(
*/
public function getFormKey()
{
- return $this->_session->getFormKey();
+ return $this->formKey->getFormKey();
}
/**
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index 953723bfeb268..59b864a1ecc27 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -49,23 +49,21 @@ class Header extends \Magento\Backend\Block\Template
*/
protected $_authSession;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\Backend\Helper\Data $backendData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param \Magento\Backend\Helper\Data $backendData
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Auth\Session $authSession,
- \Magento\Backend\Helper\Data $backendData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ \Magento\Backend\Helper\Data $backendData,
+ array $data = array()
+ ) {
$this->_backendData = $backendData;
$this->_authSession = $authSession;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
public function getHomeLink()
diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 9b039a8957798..f1434842a1196 100644
--- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -35,27 +35,30 @@
class Reset extends \Magento\Backend\Block\System\Config\Form\Field
{
+ /**
+ * Pasge robots default instructions
+ */
+ const XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS = 'design/search_engine_robots/default_custom_instructions';
+
/**
* Page robots
*
- * @var \Magento\Page\Helper\Robots
+ * @var \Magento\Theme\Helper\Robots
*/
- protected $_pageRobots = null;
+ protected $coreConfig;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Page\Helper\Robots $pageRobots
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\ConfigInterface $coreConfig
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Page\Helper\Robots $pageRobots,
- array $data = array()
- ) {
- $this->_pageRobots = $pageRobots;
- parent::__construct($context, $coreData, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\ConfigInterface $coreConfig,
+ array $data = array()
+ ) {
+ $this->coreConfig = $coreConfig;
+ parent::__construct($context, $data);
}
/*
@@ -74,7 +77,7 @@ protected function _construct()
*/
public function getRobotsDefaultCustomInstructions()
{
- return $this->_pageRobots->getRobotsDefaultCustomInstructions();
+ return trim((string)$this->coreConfig->getValue(self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, 'default'));
}
/**
diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php
index 9644f6152111a..159801a751060 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher.php
@@ -95,23 +95,21 @@ class Switcher extends \Magento\Backend\Block\Template
*/
protected $_storeFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Website\Factory $websiteFactory
- * @param \Magento\Core\Model\Store\Group\Factory $storeGroupFactory
- * @param \Magento\Core\Model\StoreFactory $storeFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Website\Factory $websiteFactory
+ * @param \Magento\Core\Model\Store\Group\Factory $storeGroupFactory
+ * @param \Magento\Core\Model\StoreFactory $storeFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Website\Factory $websiteFactory,
- \Magento\Core\Model\Store\Group\Factory $storeGroupFactory,
- \Magento\Core\Model\StoreFactory $storeFactory,
- array $data = array()
- ) {
- parent::__construct($context, $coreData, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Website\Factory $websiteFactory,
+ \Magento\Core\Model\Store\Group\Factory $storeGroupFactory,
+ \Magento\Core\Model\StoreFactory $storeFactory,
+ array $data = array()
+ ) {
+ parent::__construct($context, $data);
$this->_websiteFactory = $websiteFactory;
$this->_storeGroupFactory = $storeGroupFactory;
$this->_storeFactory = $storeFactory;
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
index 3f2a19901c1d9..a5b5f19a4735b 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit/Form.php
@@ -46,27 +46,25 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected $_userFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\User\Model\UserFactory $userFactory
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\User\Model\UserFactory $userFactory
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\User\Model\UserFactory $userFactory,
- \Magento\Backend\Model\Auth\Session $authSession,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\User\Model\UserFactory $userFactory,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ array $data = array()
+ ) {
$this->_userFactory = $userFactory;
$this->_authSession = $authSession;
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
}
protected function _prepareForm()
diff --git a/app/code/Magento/Backend/Block/System/Cache/Form.php b/app/code/Magento/Backend/Block/System/Cache/Form.php
index 2cf01c41a9e24..43470b7b2a422 100644
--- a/app/code/Magento/Backend/Block/System/Cache/Form.php
+++ b/app/code/Magento/Backend/Block/System/Cache/Form.php
@@ -36,6 +36,29 @@
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
+ /**
+ * @var \Magento\Core\Helper\Data
+ */
+ protected $_coreData;
+
+ /**
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Core\Helper\Data $coreData,
+ array $data = array()
+ ) {
+ $this->_coreData = $coreData;
+ parent::__construct($context, $registry, $formFactory, $data);
+ }
+
/**
* Initialize cache management form
*
diff --git a/app/code/Magento/Backend/Block/System/Config/Edit.php b/app/code/Magento/Backend/Block/System/Config/Edit.php
index 81f16df269312..a5733b6c49b4c 100644
--- a/app/code/Magento/Backend/Block/System/Config/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Config/Edit.php
@@ -61,26 +61,24 @@ class Edit extends \Magento\Backend\Block\Widget
*/
protected $_configStructure;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Config\Structure $configStructure
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Config\Structure $configStructure
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Config\Structure $configStructure,
- array $data = array()
- ) {
- parent::__construct($context, $coreData, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Config\Structure $configStructure,
+ array $data = array()
+ ) {
$this->_configStructure = $configStructure;
+ parent::__construct($context, $data);
}
/**
* Prepare layout object
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
@@ -94,6 +92,7 @@ protected function _prepareLayout()
$this->setHeaderCss($section->getHeaderCss());
$this->addChild('save_button', 'Magento\Backend\Block\Widget\Button', array(
+ 'id' => 'save',
'label' => __('Save Config'),
'class' => 'save primary',
'data_attribute' => array(
diff --git a/app/code/Magento/Backend/Block/System/Config/Form.php b/app/code/Magento/Backend/Block/System/Config/Form.php
index 20cc7cd2df27e..b0e931d649d7d 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form.php
@@ -126,7 +126,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Data\FormFactory $formFactory
* @param \Magento\Backend\Model\Config\Factory $configFactory
@@ -138,7 +137,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\Registry $registry,
\Magento\Data\FormFactory $formFactory,
\Magento\Backend\Model\Config\Factory $configFactory,
@@ -148,7 +146,7 @@ public function __construct(
\Magento\Core\Model\Config $coreConfig,
array $data = array()
) {
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
$this->_configFactory = $configFactory;
$this->_configStructure = $configStructure;
$this->_fieldsetFactory = $fieldsetFactory;
@@ -461,7 +459,7 @@ public function getConfigValue($path)
/**
*
*
- * @return \Magento\Backend\Block\Widget\Form|\Magento\View\Block\AbstractBlock|void
+ * @return \Magento\Backend\Block\Widget\Form|\Magento\View\Element\AbstractBlock|void
*/
protected function _beforeToHtml()
{
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
index adc4ed43bd7fa..42e8ff8570813 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -101,7 +101,7 @@ public function addColumn($name, $params)
'class' => $this->_getParam($params, 'class'),
'renderer' => false,
);
- if ((!empty($params['renderer'])) && ($params['renderer'] instanceof \Magento\View\Block\AbstractBlock)) {
+ if ((!empty($params['renderer'])) && ($params['renderer'] instanceof \Magento\View\Element\AbstractBlock)) {
$this->_columns[$name]['renderer'] = $params['renderer'];
}
}
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php b/app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php
index 28fd6d6b07483..933a2a1986e62 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Field/Regexceptions.php
@@ -42,23 +42,21 @@ class Regexceptions
*/
protected $_labelFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Data\Form\Element\Factory $elementFactory
- * @param \Magento\Core\Model\Theme\LabelFactory $labelFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Data\Form\Element\Factory $elementFactory
+ * @param \Magento\Core\Model\Theme\LabelFactory $labelFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Data\Form\Element\Factory $elementFactory,
- \Magento\Core\Model\Theme\LabelFactory $labelFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Data\Form\Element\Factory $elementFactory,
+ \Magento\Core\Model\Theme\LabelFactory $labelFactory,
+ array $data = array()
+ ) {
$this->_elementFactory = $elementFactory;
$this->_labelFactory = $labelFactory;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Config/Switcher.php b/app/code/Magento/Backend/Block/System/Config/Switcher.php
index 6ab009aeb2030..4b01635ab02a7 100644
--- a/app/code/Magento/Backend/Block/System/Config/Switcher.php
+++ b/app/code/Magento/Backend/Block/System/Config/Switcher.php
@@ -35,22 +35,20 @@ class Switcher extends \Magento\Backend\Block\Template
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\System\Store $systemStore
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\System\Store $systemStore,
array $data = array()
) {
$this->_systemStore = $systemStore;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/System/Config/System/Storage/Media/Synchronize.php b/app/code/Magento/Backend/Block/System/Config/System/Storage/Media/Synchronize.php
index ca8c823a68fe9..d888cac68e3bf 100644
--- a/app/code/Magento/Backend/Block/System/Config/System/Storage/Media/Synchronize.php
+++ b/app/code/Magento/Backend/Block/System/Config/System/Storage/Media/Synchronize.php
@@ -39,20 +39,18 @@ class Synchronize
*/
protected $_fileStorage;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\File\Storage $fileStorage
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\File\Storage $fileStorage
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\File\Storage $fileStorage,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\File\Storage $fileStorage,
+ array $data = array()
+ ) {
$this->_fileStorage = $fileStorage;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Config/Tabs.php b/app/code/Magento/Backend/Block/System/Config/Tabs.php
index 83728b75fab63..a59c7cc7f8a3e 100644
--- a/app/code/Magento/Backend/Block/System/Config/Tabs.php
+++ b/app/code/Magento/Backend/Block/System/Config/Tabs.php
@@ -76,19 +76,17 @@ class Tabs extends \Magento\Backend\Block\Widget
*/
protected $_storeCode;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Config\Structure $configStructure
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Backend\Model\Config\Structure $configStructure
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Config\Structure $configStructure,
- array $data = array()
- ) {
- parent::__construct($context, $coreData, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Backend\Model\Config\Structure $configStructure,
+ array $data = array()
+ ) {
+ parent::__construct($context, $data);
$this->_tabs = $configStructure->getTabs();
$this->setId('system_config_tabs');
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit.php b/app/code/Magento/Backend/Block/System/Design/Edit.php
index 751ea6b97c9b0..104d359393b75 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit.php
@@ -38,20 +38,18 @@ class Edit extends \Magento\Adminhtml\Block\Widget
*/
protected $_coreRegistry = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
protected function _construct()
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 32a3ef650fe1f..f41d6865deaad 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -37,27 +37,25 @@ class General extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected $_systemStore;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Core\Model\Theme\LabelFactory $labelFactory
- * @param \Magento\Core\Model\System\Store $systemStore
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Core\Model\Theme\LabelFactory $labelFactory
+ * @param \Magento\Core\Model\System\Store $systemStore
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Core\Model\Theme\LabelFactory $labelFactory,
- \Magento\Core\Model\System\Store $systemStore,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Core\Model\Theme\LabelFactory $labelFactory,
+ \Magento\Core\Model\System\Store $systemStore,
+ array $data = array()
+ ) {
$this->_labelFactory = $labelFactory;
$this->_systemStore = $systemStore;
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Shipping/Ups.php b/app/code/Magento/Backend/Block/System/Shipping/Ups.php
index 39c77447a8d0d..1c85a66774e6a 100644
--- a/app/code/Magento/Backend/Block/System/Shipping/Ups.php
+++ b/app/code/Magento/Backend/Block/System/Shipping/Ups.php
@@ -41,23 +41,21 @@ class Ups extends \Magento\Backend\Block\Template
*/
protected $_websiteModel;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Usa\Model\Shipping\Carrier\Ups $shippingModel
- * @param \Magento\Core\Model\Website $websiteModel
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Usa\Model\Shipping\Carrier\Ups $shippingModel
+ * @param \Magento\Core\Model\Website $websiteModel
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Usa\Model\Shipping\Carrier\Ups $shippingModel,
- \Magento\Core\Model\Website $websiteModel,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Usa\Model\Shipping\Carrier\Ups $shippingModel,
+ \Magento\Core\Model\Website $websiteModel,
+ array $data = array()
+ ) {
$this->_shippingModel = $shippingModel;
$this->_websiteModel = $websiteModel;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit.php b/app/code/Magento/Backend/Block/System/Store/Edit.php
index e43f5746b0fcf..519293e54428c 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit.php
@@ -39,20 +39,18 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
protected $_coreRegistry = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
index 65fce16e9cb3f..b5ecebb8e411b 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php
@@ -54,30 +54,28 @@ class Group
*/
protected $_websiteFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Catalog\Model\Config\Source\Category $category
- * @param \Magento\Core\Model\StoreFactory $storeFactory
- * @param \Magento\Core\Model\Website\Factory $websiteFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Catalog\Model\Config\Source\Category $category
+ * @param \Magento\Core\Model\StoreFactory $storeFactory
+ * @param \Magento\Core\Model\Website\Factory $websiteFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Catalog\Model\Config\Source\Category $category,
- \Magento\Core\Model\StoreFactory $storeFactory,
- \Magento\Core\Model\Website\Factory $websiteFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Catalog\Model\Config\Source\Category $category,
+ \Magento\Core\Model\StoreFactory $storeFactory,
+ \Magento\Core\Model\Website\Factory $websiteFactory,
+ array $data = array()
+ ) {
$this->_category = $category;
$this->_storeFactory = $storeFactory;
$this->_websiteFactory = $websiteFactory;
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
index 43006b0954ae2..8ecc56346b093 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php
@@ -49,27 +49,25 @@ class Store
*/
protected $_groupFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Core\Model\Store\Group\Factory $groupFactory
- * @param \Magento\Core\Model\Website\Factory $websiteFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Core\Model\Store\Group\Factory $groupFactory
+ * @param \Magento\Core\Model\Website\Factory $websiteFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Core\Model\Store\Group\Factory $groupFactory,
- \Magento\Core\Model\Website\Factory $websiteFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Core\Model\Store\Group\Factory $groupFactory,
+ \Magento\Core\Model\Website\Factory $websiteFactory,
+ array $data = array()
+ ) {
$this->_groupFactory = $groupFactory;
$this->_websiteFactory = $websiteFactory;
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
index 284e0d7c0b764..fadb2f024df7d 100644
--- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php
@@ -44,24 +44,22 @@ class Website
*/
protected $_groupFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Core\Model\Store\GroupFactory $groupFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Core\Model\Store\GroupFactory $groupFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Core\Model\Store\GroupFactory $groupFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Core\Model\Store\GroupFactory $groupFactory,
+ array $data = array()
+ ) {
$this->_groupFactory = $groupFactory;
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ parent::__construct($context, $registry, $formFactory, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/System/Variable/Edit.php b/app/code/Magento/Backend/Block/System/Variable/Edit.php
index c1c4668a1ff6f..09b71ed2bcaf9 100644
--- a/app/code/Magento/Backend/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Variable/Edit.php
@@ -38,20 +38,18 @@ class Edit extends \Magento\Adminhtml\Block\Widget\Form\Container
*/
protected $_coreRegistry = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index f7f0f0dbb6bca..e13c3daf2d7b0 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -31,7 +31,7 @@
*
* @SuppressWarnings(PHPMD.NumberOfChildren)
*/
-class Template extends \Magento\View\Block\Template
+class Template extends \Magento\View\Element\Template
{
/**
* @var \Magento\AuthorizationInterface
@@ -53,21 +53,25 @@ class Template extends \Magento\View\Block\Template
*/
protected $_backendSession;
+ /**
+ * @var \Magento\Data\Form\FormKey
+ */
+ protected $formKey;
+
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
array $data = array()
) {
$this->_locale = $context->getLocale();
$this->_authorization = $context->getAuthorization();
$this->mathRandom = $context->getMathRandom();
$this->_backendSession = $context->getBackendSession();
- parent::__construct($context, $coreData, $data);
+ $this->formKey = $context->getFormKey();
+ parent::__construct($context, $data);
}
/**
@@ -77,7 +81,7 @@ public function __construct(
*/
public function getFormKey()
{
- return $this->_session->getFormKey();
+ return $this->formKey->getFormKey();
}
/**
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index ca04a1cafaa06..cc5d8166fb1eb 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -28,7 +28,7 @@
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Context extends \Magento\View\Block\Template\Context
+class Context extends \Magento\View\Element\Template\Context
{
/**
* @var \Magento\AuthorizationInterface
@@ -45,6 +45,11 @@ class Context extends \Magento\View\Block\Template\Context
*/
protected $_backendSession;
+ /**
+ * @var \Magento\Data\Form\FormKey
+ */
+ protected $formKey;
+
/**
* @param \Magento\App\RequestInterface $request
* @param \Magento\View\LayoutInterface $layout
@@ -54,6 +59,7 @@ class Context extends \Magento\View\Block\Template\Context
* @param \Magento\App\CacheInterface $cache
* @param \Magento\View\DesignInterface $design
* @param \Magento\Core\Model\Session $session
+ * @param \Magento\Session\SidResolverInterface $sidResolver
* @param \Magento\Core\Model\Store\Config $storeConfig
* @param \Magento\App\FrontController $frontController
* @param \Magento\App\Helper\HelperFactory $helperFactory
@@ -74,6 +80,7 @@ class Context extends \Magento\View\Block\Template\Context
* @param \Magento\AuthorizationInterface $authorization
* @param \Magento\Backend\Model\Session $backendSession
* @param \Magento\Math\Random $mathRandom
+ * @param \Magento\Data\Form\FormKey $formKey
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -87,6 +94,7 @@ public function __construct(
\Magento\App\CacheInterface $cache,
\Magento\View\DesignInterface $design,
\Magento\Core\Model\Session $session,
+ \Magento\Session\SidResolverInterface $sidResolver,
\Magento\Core\Model\Store\Config $storeConfig,
\Magento\App\FrontController $frontController,
\Magento\App\Helper\HelperFactory $helperFactory,
@@ -107,11 +115,13 @@ public function __construct(
\Magento\AuthorizationInterface $authorization,
\Magento\Backend\Model\Session $backendSession,
\Magento\Math\Random $mathRandom,
+ \Magento\Data\Form\FormKey $formKey,
array $data = array()
) {
$this->_authorization = $authorization;
$this->_backendSession = $backendSession;
$this->mathRandom = $mathRandom;
+ $this->formKey = $formKey;
parent::__construct(
$request,
$layout,
@@ -121,6 +131,7 @@ public function __construct(
$cache,
$design,
$session,
+ $sidResolver,
$storeConfig,
$frontController,
$helperFactory,
@@ -142,7 +153,6 @@ public function __construct(
);
}
-
/**
* Get store manager
*
@@ -186,4 +196,12 @@ public function getMathRandom()
{
return $this->mathRandom;
}
+
+ /**
+ * @return \Magento\Data\Form\FormKey
+ */
+ public function getFormKey()
+ {
+ return $this->formKey;
+ }
}
diff --git a/app/code/Magento/Backend/Block/Text/ListText.php b/app/code/Magento/Backend/Block/Text/ListText.php
index cff54dcb7ad3a..6467570d39b21 100644
--- a/app/code/Magento/Backend/Block/Text/ListText.php
+++ b/app/code/Magento/Backend/Block/Text/ListText.php
@@ -34,6 +34,6 @@
*/
namespace Magento\Backend\Block\Text;
-class ListText extends \Magento\View\Block\Text\ListText
+class ListText extends \Magento\View\Element\Text\ListText
{
}
diff --git a/app/code/Magento/Backend/Block/Widget/Accordion.php b/app/code/Magento/Backend/Block/Widget/Accordion.php
index 7de430c0a747f..092744bedd427 100644
--- a/app/code/Magento/Backend/Block/Widget/Accordion.php
+++ b/app/code/Magento/Backend/Block/Widget/Accordion.php
@@ -57,7 +57,7 @@ public function addItem($itemId, $config)
->setData($config)
->setAccordion($this)
->setId($itemId);
- if (isset($config['content']) && $config['content'] instanceof \Magento\View\Block\AbstractBlock) {
+ if (isset($config['content']) && $config['content'] instanceof \Magento\View\Element\AbstractBlock) {
$this->_items[$itemId]->setChild($itemId.'_content', $config['content']);
}
diff --git a/app/code/Magento/Backend/Block/Widget/Accordion/Item.php b/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
index 85b65c92a2183..63b55d67dd37a 100644
--- a/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Accordion/Item.php
@@ -64,7 +64,7 @@ public function getContent()
if (is_string($content)) {
return $content;
}
- if ($content instanceof \Magento\View\Block\AbstractBlock) {
+ if ($content instanceof \Magento\View\Element\AbstractBlock) {
return $content->toHtml();
}
return null;
diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index bcb67e4605121..4abea54585f5e 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -113,7 +113,7 @@ protected function _prepareAttributes($title, $classes, $disabled)
'onclick' => $this->getOnClick(),
'style' => $this->getStyle(),
'value' => $this->getValue(),
- 'disabled' => $disabled
+ 'disabled' => $disabled,
);
if ($this->getDataAttribute()) {
foreach ($this->getDataAttribute() as $key => $attr) {
diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php
index 3cdb73c67b403..558184496dbe1 100644
--- a/app/code/Magento/Backend/Block/Widget/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Container.php
@@ -202,7 +202,7 @@ public function updateButton($buttonId, $key = null, $data)
/**
* Preparing child blocks for each added button
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Form.php b/app/code/Magento/Backend/Block/Widget/Form.php
index d3f6dd06e7a79..f1a5f5a57799d 100644
--- a/app/code/Magento/Backend/Block/Widget/Form.php
+++ b/app/code/Magento/Backend/Block/Widget/Form.php
@@ -47,18 +47,16 @@ class Form extends \Magento\Backend\Block\Widget
*/
protected $_locale;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ array $data = array()
+ ) {
$this->_locale = $context->getLocale();
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
@@ -78,7 +76,7 @@ protected function _construct()
*
* You can redefine this method in child classes for changing layout
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
@@ -154,7 +152,7 @@ protected function _prepareForm()
/**
* This method is called before rendering HTML
*
- * @return \Magento\Backend\Block\Widget\Form|\Magento\View\Block\AbstractBlock
+ * @return \Magento\Backend\Block\Widget\Form|\Magento\View\Element\AbstractBlock
*/
protected function _beforeToHtml()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index a2494e34954da..17a5670c42828 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -84,7 +84,7 @@ protected function _construct()
/**
* Create form block
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 8d9d9de344b37..0a0f635a0ba20 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -60,41 +60,39 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
protected $_configOptions = array();
/**
- * Add name => id mapping
- *
- * @param string $fieldId - element ID in DOM
- * @param string $fieldName - element name in their fieldset/form namespace
- * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
- */
- /**
- * Core data
- *
- * @var \Magento\Core\Helper\Data
+ * @var \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory
*/
- protected $_coreData;
+ protected $_fieldFactory;
/**
- * @var \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory
+ * @var \Magento\Json\EncoderInterface
*/
- protected $_fieldFactory;
+ protected $_jsonEncoder;
- /**
- * @param \Magento\Backend\Block\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory,
- array $data = array()
- ) {
- $this->_coreData = $coreData;
+ public function __construct(
+ \Magento\Backend\Block\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ \Magento\Backend\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory,
+ array $data = array()
+ ) {
+ $this->_jsonEncoder = $jsonEncoder;
$this->_fieldFactory = $fieldFactory;
parent::__construct($context, $data);
}
+ /**
+ * Add name => id mapping
+ *
+ * @param string $fieldId - element ID in DOM
+ * @param string $fieldName - element name in their fieldset/form namespace
+ * @return \Magento\Backend\Block\Widget\Form\Element\Dependence
+ */
public function addFieldMap($fieldId, $fieldName)
{
$this->_fields[$fieldName] = $fieldId;
@@ -146,7 +144,7 @@ protected function _toHtml()
return '';
}
@@ -166,6 +164,6 @@ protected function _getDependsJson()
);
}
}
- return $this->_coreData->jsonEncode($result);
+ return $this->_jsonEncoder->encode($result);
}
}
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Generic.php b/app/code/Magento/Backend/Block/Widget/Form/Generic.php
index 713f3e1216149..383fb366ad5e2 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Generic.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Generic.php
@@ -47,22 +47,20 @@ class Generic extends \Magento\Backend\Block\Widget\Form
*/
protected $_coreRegistry;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ array $data = array()
+ ) {
$this->_coreRegistry = $registry;
$this->_formFactory = $formFactory;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid.php b/app/code/Magento/Backend/Block/Widget/Grid.php
index 1ccbc22101f6f..87423d607b7db 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid.php
@@ -121,19 +121,17 @@ class Grid extends \Magento\Backend\Block\Widget
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param \Magento\Core\Model\Url $urlModel
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
\Magento\Core\Model\Url $urlModel,
array $data = array()
) {
$this->_urlModel = $urlModel;
$this->_backendSession = $context->getBackendSession();
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
protected function _construct()
@@ -208,7 +206,7 @@ public function getColumnSet()
* Retrieve export block
*
* @throws \Magento\Core\Exception
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
public function getExportBlock()
{
@@ -242,7 +240,7 @@ public function getColumnCount()
* Retrieve column by id
*
* @param string $columnId
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
public function getColumn($columnId)
{
@@ -404,7 +402,7 @@ protected function _prepareGrid()
/**
* Get massaction block
*
- * @return bool|\Magento\View\Block\AbstractBlock
+ * @return bool|\Magento\View\Element\AbstractBlock
*/
public function getMassactionBlock()
{
@@ -436,7 +434,7 @@ protected function _prepareFilterButtons()
/**
* Initialize grid before rendering
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _beforeToHtml()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
index 4351f21f1adb9..a56ea489a55ba 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php
@@ -25,22 +25,20 @@
class Extended extends \Magento\Backend\Block\Widget\Grid\Column
{
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ array $data = array()
+ ) {
$this->_rendererTypes['options'] = 'Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Extended';
$this->_filterTypes['options'] = 'Magento\Backend\Block\Widget\Grid\Column\Filter\Select\Extended';
$this->_rendererTypes['select'] = 'Magento\Backend\Block\Widget\Grid\Column\Renderer\Select\Extended';
$this->_rendererTypes['checkbox'] = 'Magento\Backend\Block\Widget\Grid\Column\Renderer\Checkboxes\Extended';
$this->_rendererTypes['radio'] = 'Magento\Backend\Block\Widget\Grid\Column\Renderer\Radio\Extended';
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
index 848a262308cb4..139159622f114 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php
@@ -37,15 +37,13 @@ class Multistore extends \Magento\Backend\Block\Widget\Grid\Column
{
/**
* @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
* @param array $data
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
array $data = array()
) {
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 8c88e4caf3b72..d6c8d66804524 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -33,28 +33,24 @@
*/
namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
-class Action
- extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
+class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
{
-
/**
- * Core data
- *
- * @var \Magento\Core\Helper\Data
+ * @var \Magento\Json\EncoderInterface
*/
- protected $_coreData = null;
+ protected $_jsonEncoder;
- /**
- * @param \Magento\Backend\Block\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Context $context,
- \Magento\Core\Helper\Data $coreData,
- array $data = array()
- ) {
- $this->_coreData = $coreData;
+ public function __construct(
+ \Magento\Backend\Block\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ array $data = array()
+ ) {
+ $this->_jsonEncoder = $jsonEncoder;
parent::__construct($context, $data);
}
@@ -106,7 +102,7 @@ protected function _toOptionHtml($action, \Magento\Object $row)
$actionCaption = '';
$this->_transformActionData($action, $actionCaption, $row);
- $htmlAttibutes = array('value'=>$this->escapeHtml($this->_coreData->jsonEncode($action)));
+ $htmlAttibutes = array('value'=>$this->escapeHtml($this->_jsonEncoder->encode($action)));
$actionAttributes->setData($htmlAttibutes);
return '';
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
index 20771cbace8a0..051f06d6f57a9 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/ColumnSet.php
@@ -34,7 +34,7 @@
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class ColumnSet extends \Magento\View\Block\Template
+class ColumnSet extends \Magento\View\Element\Template
{
/**
* @var \Magento\Backend\Model\Widget\Grid\Row\UrlGenerator
@@ -120,16 +120,14 @@ class ColumnSet extends \Magento\View\Block\Template
protected $_totals = null;
/**
- * @param \Magento\View\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\View\Element\Template\Context $context
* @param \Magento\Backend\Model\Widget\Grid\Row\UrlGeneratorFactory $generatorFactory
* @param \Magento\Backend\Model\Widget\Grid\SubTotals $subtotals
* @param \Magento\Backend\Model\Widget\Grid\Totals $totals
* @param array $data
*/
public function __construct(
- \Magento\View\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
+ \Magento\View\Element\Template\Context $context,
\Magento\Backend\Model\Widget\Grid\Row\UrlGeneratorFactory $generatorFactory,
\Magento\Backend\Model\Widget\Grid\SubTotals $subtotals,
\Magento\Backend\Model\Widget\Grid\Totals $totals,
@@ -149,7 +147,7 @@ public function __construct(
array_key_exists('filter_visibility', $data) ? (bool) $data['filter_visibility'] : true
);
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
$this->setEmptyText(__(
isset($data['empty_text'])? $data['empty_text'] : 'We couldn\'t find any records.'
@@ -242,7 +240,7 @@ public function setFilterType($type, $className)
/**
* Prepare block for rendering
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _beforeToHtml()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 1c7ea433520bc..c4a194c43cf96 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -64,20 +64,18 @@ class Export
*/
protected $_collectionFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Data\CollectionFactory $collectionFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Data\CollectionFactory $collectionFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Data\CollectionFactory $collectionFactory,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Data\CollectionFactory $collectionFactory,
+ array $data = array()
+ ) {
$this->_collectionFactory = $collectionFactory;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
protected function _construct()
@@ -157,7 +155,7 @@ public function getId()
/**
* Prepare export button
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index c2a02a878227d..27710cfc645e0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -190,7 +190,7 @@ protected function _construct()
/**
* Initialize child blocks
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
protected function _prepareLayout()
{
@@ -223,7 +223,7 @@ protected function _prepareLayout()
/**
* Retrieve column set block
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
public function getColumnSet()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 88c70aad1f0c2..2b9c927caf667 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -35,8 +35,15 @@
*/
namespace Magento\Backend\Block\Widget\Grid\Massaction;
+use Magento\View\Element\Template;
+
abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
{
+ /**
+ * @var \Magento\Json\EncoderInterface
+ */
+ protected $_jsonEncoder;
+
/**
* Backend data helper
*
@@ -53,6 +60,20 @@ abstract class AbstractMassaction extends \Magento\Backend\Block\Widget
protected $_template = 'Magento_Backend::widget/grid/massaction.phtml';
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ array $data = array()
+ ) {
+ $this->_jsonEncoder = $jsonEncoder;
+ parent::__construct($context, $data);
+ }
+
protected function _construct()
{
parent::_construct();
@@ -134,7 +155,7 @@ public function getItemsJson()
$result[$itemId] = $item->toArray();
}
- return $this->_coreData->jsonEncode($result);
+ return $this->_jsonEncoder->encode($result);
}
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
index 5695da8fee3e5..94ccea59c988d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php
@@ -44,23 +44,21 @@ class Additional extends \Magento\Backend\Block\Widget\Form\Generic
*/
protected $_handlerFactory;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Core\Model\Registry $registry
- * @param \Magento\Data\FormFactory $formFactory
- * @param \Magento\Core\Model\Layout\Argument\HandlerFactory $handlerFactory
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Model\Registry $registry
+ * @param \Magento\Data\FormFactory $formFactory
+ * @param \Magento\Core\Model\Layout\Argument\HandlerFactory $handlerFactory
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Core\Model\Registry $registry,
- \Magento\Data\FormFactory $formFactory,
- \Magento\Core\Model\Layout\Argument\HandlerFactory $handlerFactory,
- array $data = array()
- ) {
- parent::__construct($context, $coreData, $registry, $formFactory, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Model\Registry $registry,
+ \Magento\Data\FormFactory $formFactory,
+ \Magento\Core\Model\Layout\Argument\HandlerFactory $handlerFactory,
+ array $data = array()
+ ) {
+ parent::__construct($context, $registry, $formFactory, $data);
$this->_handlerFactory = $handlerFactory;
}
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index f706254a356de..66f34d6e07ce9 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -59,20 +59,26 @@ class Extended extends \Magento\Backend\Block\Widget
*/
protected $_backendData = null;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Helper\Data $backendData
- * @param array $data
+ /**
+ * @var \Magento\Json\EncoderInterface
+ */
+ protected $_jsonEncoder;
+
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param \Magento\Backend\Helper\Data $backendData
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Helper\Data $backendData,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ \Magento\Backend\Helper\Data $backendData,
+ array $data = array()
+ ) {
+ $this->_jsonEncoder = $jsonEncoder;
$this->_backendData = $backendData;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
}
/**
@@ -92,7 +98,7 @@ public function _construct()
* 'complete' => string, // Only for ajax enabled grid (optional)
* 'url' => string,
* 'confirm' => string, // text of confirmation of this action (optional)
- * 'additional' => string|array|\Magento\View\Block\AbstractBlock // (optional)
+ * 'additional' => string|array|\Magento\View\Element\AbstractBlock // (optional)
* );
*
* @param string $itemId
@@ -151,7 +157,7 @@ public function getItemsJson()
$result[$itemId] = $item->toArray();
}
- return $this->_coreData->jsonEncode($result);
+ return $this->_jsonEncoder->encode($result);
}
/**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
index e573b5a3ce26c..04f17c8c808e5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Item.php
@@ -64,7 +64,7 @@ public function getMassaction()
/**
* Set additional action block for this item
*
- * @param string|\Magento\View\Block\AbstractBlock $block
+ * @param string|\Magento\View\Element\AbstractBlock $block
* @return \Magento\Backend\Block\Widget\Grid\Massaction\Item
* @throws \Magento\Core\Exception
*/
@@ -74,7 +74,7 @@ public function setAdditionalActionBlock($block)
$block = $this->getLayout()->createBlock($block);
} elseif (is_array($block)) {
$block = $this->_createFromConfig($block);
- } elseif (!($block instanceof \Magento\View\Block\AbstractBlock)) {
+ } elseif (!($block instanceof \Magento\View\Element\AbstractBlock)) {
throw new \Magento\Core\Exception('Unknown block type');
}
@@ -99,7 +99,7 @@ protected function _createFromConfig(array $config)
/**
* Retrieve additional action block for this item
*
- * @return \Magento\View\Block\AbstractBlock
+ * @return \Magento\View\Element\AbstractBlock
*/
public function getAdditionalActionBlock()
{
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php b/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
index c28b6ef2cdc8d..e58e38e98e8b6 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Serializer.php
@@ -33,8 +33,27 @@
*/
namespace Magento\Backend\Block\Widget\Grid;
-class Serializer extends \Magento\View\Block\Template
+class Serializer extends \Magento\View\Element\Template
{
+ /**
+ * @var \Magento\Json\EncoderInterface
+ */
+ protected $_jsonEncoder;
+
+ /**
+ * @param \Magento\View\Element\Template\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\View\Element\Template\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ array $data = array()
+ ) {
+ $this->_jsonEncoder = $jsonEncoder;
+ parent::__construct($context, $data);
+ }
+
/**
* Preparing global layout
*
@@ -72,7 +91,7 @@ public function _construct()
public function getColumnInputNames($asJSON = false)
{
if ($asJSON) {
- return $this->_coreData->jsonEncode((array)$this->getInputNames());
+ return $this->_jsonEncoder->encode((array)$this->getInputNames());
}
return (array)$this->getInputNames();
}
@@ -91,6 +110,6 @@ public function getDataAsJSON()
} elseif (!empty($inputNames)) {
return '{}';
}
- return $this->_coreData->jsonEncode($result);
+ return $this->_jsonEncoder->encode($result);
}
}
diff --git a/app/code/Magento/Backend/Block/Widget/Tabs.php b/app/code/Magento/Backend/Block/Widget/Tabs.php
index 076d838ef9af7..36ee1a2579fec 100644
--- a/app/code/Magento/Backend/Block/Widget/Tabs.php
+++ b/app/code/Magento/Backend/Block/Widget/Tabs.php
@@ -59,21 +59,26 @@ class Tabs extends \Magento\Backend\Block\Widget
* @var \Magento\Backend\Model\Auth\Session
*/
protected $_authSession;
+ /**
+ * @var \Magento\Json\EncoderInterface
+ */
+ private $_jsonEncoder;
- /**
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Json\EncoderInterface $jsonEncoder
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param array $data
*/
- public function __construct(
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Model\Auth\Session $authSession,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Json\EncoderInterface $jsonEncoder,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ array $data = array()
+ ) {
$this->_authSession = $authSession;
- parent::__construct($context, $coreData, $data);
+ parent::__construct($context, $data);
+ $this->_jsonEncoder = $jsonEncoder;
}
/**
@@ -402,7 +407,7 @@ public function getAllShadowTabs($asJson = true)
}
}
if ($asJson) {
- return $this->_coreData->jsonEncode($result);
+ return $this->_jsonEncoder->encode($result);
}
return $result;
}
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index 51c97b9f6e3ca..5668dce84c584 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -70,7 +70,7 @@ public function __construct(
*/
protected function _getSession()
{
- return $this->_objectManager->get('Magento\Adminhtml\Model\Session');
+ return $this->_objectManager->get('Magento\Core\Model\Session\AbstractSession');
}
/**
@@ -125,6 +125,9 @@ public function massEnableAction()
try {
$types = $this->getRequest()->getParam('types');
$updatedTypes = 0;
+ if (!is_array($types)) {
+ $types = array();
+ }
$this->_validateTypes($types);
foreach ($types as $code) {
if (!$this->_cacheState->isEnabled($code)) {
@@ -158,6 +161,9 @@ public function massDisableAction()
try {
$types = $this->getRequest()->getParam('types');
$updatedTypes = 0;
+ if (!is_array($types)) {
+ $types = array();
+ }
$this->_validateTypes($types);
foreach ($types as $code) {
if ($this->_cacheState->isEnabled($code)) {
@@ -174,8 +180,7 @@ public function massDisableAction()
}
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- }
- catch (\Exception $e) {
+ } catch (\Exception $e) {
$this->_getSession()->addException(
$e,
__('An error occurred while disabling cache.')
@@ -192,6 +197,9 @@ public function massRefreshAction()
try {
$types = $this->getRequest()->getParam('types');
$updatedTypes = 0;
+ if (!is_array($types)) {
+ $types = array();
+ }
$this->_validateTypes($types);
foreach ($types as $type) {
$this->_cacheTypeList->cleanType($type);
@@ -199,18 +207,12 @@ public function massRefreshAction()
$updatedTypes++;
}
if ($updatedTypes > 0) {
- $this->_getSession()->addSuccess(
- __("%1 cache type(s) refreshed.", $updatedTypes)
- );
+ $this->_getSession()->addSuccess(__("%1 cache type(s) refreshed.", $updatedTypes));
}
} catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- }
- catch (\Exception $e) {
- $this->_getSession()->addException(
- $e,
- __('An error occurred while refreshing cache.')
- );
+ } catch (\Exception $e) {
+ $this->_getSession()->addException($e, __('An error occurred while refreshing cache.'));
}
$this->_redirect('adminhtml/*');
}
@@ -238,17 +240,13 @@ protected function _validateTypes(array $types)
public function cleanMediaAction()
{
try {
- $this->_objectManager->get('Magento\Core\Model\Page\Asset\MergeService')
+ $this->_objectManager->get('Magento\View\Asset\MergeService')
->cleanMergedJsCss();
$this->_eventManager->dispatch('clean_media_cache_after');
- $this->_getSession()->addSuccess(
- __('The JavaScript/CSS cache has been cleaned.')
- );
- }
- catch (\Magento\Core\Exception $e) {
+ $this->_getSession()->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
+ } catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- }
- catch (\Exception $e) {
+ } catch (\Exception $e) {
$this->_getSession()->addException(
$e,
__('An error occurred while clearing the JavaScript/CSS cache.')
@@ -268,11 +266,9 @@ public function cleanImagesAction()
$this->_getSession()->addSuccess(
__('The image cache was cleaned.')
);
- }
- catch (\Magento\Core\Exception $e) {
+ } catch (\Magento\Core\Exception $e) {
$this->_getSession()->addError($e->getMessage());
- }
- catch (\Exception $e) {
+ } catch (\Exception $e) {
$this->_getSession()->addException(
$e,
__('An error occurred while clearing the image cache.')
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
index 47cba7c717e5b..d7203803eb7ac 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
@@ -120,7 +120,7 @@ public function editAction()
->_addContent(
$this->_view->getLayout()->createBlock('Magento\Backend\Block\System\Variable\Edit')
)
- ->_addJs($this->_view->getLayout()->createBlock('Magento\View\Block\Template', '', array(
+ ->_addJs($this->_view->getLayout()->createBlock('Magento\View\Element\Template', '', array(
'data' => array('template' => 'Magento_Backend::system/variable/js.phtml')
)));
$this->_view->renderLayout();
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index d54df862667cd..fb023198b7c88 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -63,6 +63,8 @@ class Session
/**
* @param \Magento\Core\Model\Session\Context $context
+ * @param \Magento\Session\SidResolverInterface $sidResolver
+ * @param \Magento\Session\Config\ConfigInterface $sessionConfig
* @param \Magento\Acl\Builder $aclBuilder
* @param \Magento\Backend\Model\Url $backendUrl
* @param \Magento\Backend\App\ConfigInterface $config
@@ -70,6 +72,8 @@ class Session
*/
public function __construct(
\Magento\Core\Model\Session\Context $context,
+ \Magento\Session\SidResolverInterface $sidResolver,
+ \Magento\Session\Config\ConfigInterface $sessionConfig,
\Magento\Acl\Builder $aclBuilder,
\Magento\Backend\Model\Url $backendUrl,
\Magento\Backend\App\ConfigInterface $config,
@@ -78,8 +82,8 @@ public function __construct(
$this->_config = $config;
$this->_aclBuilder = $aclBuilder;
$this->_backendUrl = $backendUrl;
- parent::__construct($context, $data);
- $this->init('admin');
+ parent::__construct($context, $sidResolver, $sessionConfig, $data);
+ $this->start('admin');
}
/**
@@ -95,9 +99,9 @@ public function __construct(
* @return \Magento\Backend\Model\Auth\Session
* @see self::login()
*/
- public function init($namespace, $sessionName = null)
+ public function start($namespace = 'default', $sessionName = null)
{
- parent::init($namespace, $sessionName);
+ parent::start($namespace, $sessionName);
// @todo implement solution that keeps is_first_visit flag in session during redirects
return $this;
}
@@ -209,7 +213,7 @@ public function setIsFirstPageAfterLogin($value)
public function processLogin()
{
if ($this->getUser()) {
- $this->renewSession();
+ $this->regenerateId();
if ($this->_backendUrl->useSecretKey()) {
$this->_backendUrl->renewSecretUrls();
@@ -229,8 +233,7 @@ public function processLogin()
*/
public function processLogout()
{
- $this->unsetAll();
- $this->getCookie()->delete($this->getSessionName());
+ $this->destroy();
return $this;
}
@@ -244,14 +247,4 @@ public function isValidForPath($path)
{
return true;
}
-
- /**
- * Always try to get session id from query in backend area
- *
- * @return bool
- */
- protected function _isSidUsedFromQueryParam()
- {
- return true;
- }
}
diff --git a/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php b/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
index c378d6b8096ad..3f443e53d9729 100644
--- a/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
+++ b/app/code/Magento/Backend/Model/Cache/Resource/Grid/Collection.php
@@ -33,12 +33,12 @@ class Collection extends \Magento\Data\Collection
protected $_cacheTypeList;
/**
- * @param \Magento\App\Cache\TypeListInterface $cacheTypeList
* @param \Magento\Core\Model\EntityFactory $entityFactory
+ * @param \Magento\App\Cache\TypeListInterface $cacheTypeList
*/
public function __construct(
- \Magento\App\Cache\TypeListInterface $cacheTypeList,
- \Magento\Core\Model\EntityFactory $entityFactory
+ \Magento\Core\Model\EntityFactory $entityFactory,
+ \Magento\App\Cache\TypeListInterface $cacheTypeList
) {
$this->_cacheTypeList = $cacheTypeList;
parent::__construct($entityFactory);
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
index 78f025a1dde32..73fccd88e4f64 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
@@ -89,8 +89,7 @@ public function afterCustomUrlChanged()
return;
}
- $this->_authSession->unsetAll();
- $this->_authSession->getCookie()->delete($this->_authSession->getSessionName());
+ $this->_authSession->destroy();
$route = $this->_backendData->getAreaFrontName();
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Baseurl.php b/app/code/Magento/Backend/Model/Config/Backend/Baseurl.php
index b8e152f162774..6cc537374f6f5 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Baseurl.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Baseurl.php
@@ -26,7 +26,7 @@
class Baseurl extends \Magento\Core\Model\Config\Value
{
/**
- * @var \Magento\Core\Model\Page\Asset\MergeService
+ * @var \Magento\View\Asset\MergeService
*/
protected $_mergeService;
@@ -35,7 +35,7 @@ class Baseurl extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Config $config
- * @param \Magento\Core\Model\Page\Asset\MergeService $mergeService
+ * @param \Magento\View\Asset\MergeService $mergeService
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -45,7 +45,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Config $config,
- \Magento\Core\Model\Page\Asset\MergeService $mergeService,
+ \Magento\View\Asset\MergeService $mergeService,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
diff --git a/app/code/Magento/Backend/Model/Config/Backend/File.php b/app/code/Magento/Backend/Model/Config/Backend/File.php
index ad53e13aa4c20..ba08ac5b49f16 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/File.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/File.php
@@ -61,26 +61,24 @@ class File extends \Magento\Core\Model\Config\Value
protected $_dir;
/**
- * @param \Magento\Core\Model\File\UploaderFactory $uploaderFactory
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Config $config
+ * @param \Magento\Core\Model\File\UploaderFactory $uploaderFactory
* @param \Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface $requestData
* @param \Magento\Filesystem $filesystem
* @param \Magento\App\Dir $dir
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
- *
- * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
- \Magento\Core\Model\File\UploaderFactory $uploaderFactory,
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Config $config,
+ \Magento\Core\Model\File\UploaderFactory $uploaderFactory,
\Magento\Backend\Model\Config\Backend\File\RequestData\RequestDataInterface $requestData,
\Magento\Filesystem $filesystem,
\Magento\App\Dir $dir,
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Secure.php b/app/code/Magento/Backend/Model/Config/Backend/Secure.php
index 0dcb6e1dea5fc..8b5bc5373775a 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Secure.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Secure.php
@@ -26,7 +26,7 @@
class Secure extends \Magento\Core\Model\Config\Value
{
/**
- * @var \Magento\Core\Model\Page\Asset\MergeService
+ * @var \Magento\View\Asset\MergeService
*/
protected $_mergeService;
@@ -35,7 +35,7 @@ class Secure extends \Magento\Core\Model\Config\Value
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Config $config
- * @param \Magento\Core\Model\Page\Asset\MergeService $mergeService
+ * @param \Magento\View\Asset\MergeService $mergeService
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
@@ -45,7 +45,7 @@ public function __construct(
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Config $config,
- \Magento\Core\Model\Page\Asset\MergeService $mergeService,
+ \Magento\View\Asset\MergeService $mergeService,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Storage/Media/Database.php b/app/code/Magento/Backend/Model/Config/Backend/Storage/Media/Database.php
index ec624916431bb..ae82e04232570 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Storage/Media/Database.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Storage/Media/Database.php
@@ -37,21 +37,21 @@ class Database extends \Magento\Core\Model\Config\Value
protected $_coreFileStorage = null;
/**
- * @param \Magento\Core\Helper\File\Storage $coreFileStorage
* @param \Magento\Core\Model\Context $context
* @param \Magento\Core\Model\Registry $registry
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
* @param \Magento\Core\Model\Config $config
+ * @param \Magento\Core\Helper\File\Storage $coreFileStorage
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
*/
public function __construct(
- \Magento\Core\Helper\File\Storage $coreFileStorage,
\Magento\Core\Model\Context $context,
\Magento\Core\Model\Registry $registry,
\Magento\Core\Model\StoreManagerInterface $storeManager,
\Magento\Core\Model\Config $config,
+ \Magento\Core\Helper\File\Storage $coreFileStorage,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
diff --git a/app/code/Magento/Backend/Model/Session.php b/app/code/Magento/Backend/Model/Session.php
index b5e2226d74429..5f0e0863a5038 100644
--- a/app/code/Magento/Backend/Model/Session.php
+++ b/app/code/Magento/Backend/Model/Session.php
@@ -29,12 +29,18 @@ class Session extends \Magento\Core\Model\Session\AbstractSession
{
/**
* @param \Magento\Core\Model\Session\Context $context
+ * @param \Magento\Session\SidResolverInterface $sidResolver
+ * @param \Magento\Session\Config\ConfigInterface $sessionConfig
* @param array $data
*/
- public function __construct(\Magento\Core\Model\Session\Context $context, array $data = array())
- {
- parent::__construct($context, $data);
- $this->init('adminhtml');
+ public function __construct(
+ \Magento\Core\Model\Session\Context $context,
+ \Magento\Session\SidResolverInterface $sidResolver,
+ \Magento\Session\Config\ConfigInterface $sessionConfig,
+ array $data = array()
+ ) {
+ parent::__construct($context, $sidResolver, $sessionConfig, $data);
+ $this->start('adminhtml');
}
/**
@@ -47,14 +53,4 @@ public function isValidForPath($path)
{
return true;
}
-
- /**
- * Always try to get session id from query in backend area
- *
- * @return bool
- */
- protected function _isSidUsedFromQueryParam()
- {
- return true;
- }
}
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index fbc1d4e42607f..f4e902d153c1f 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -69,11 +69,6 @@ class Url extends \Magento\Core\Model\Url
*/
protected $_backendHelper;
- /**
- * @var \Magento\Core\Model\Session
- */
- protected $_coreSession;
-
/**
* Menu config
*
@@ -106,6 +101,11 @@ class Url extends \Magento\Core\Model\Url
*/
protected $_coreConfig;
+ /**
+ * @var \Magento\Data\Form\FormKey
+ */
+ protected $formKey;
+
/**
* @param \Magento\App\Route\ConfigInterface $routeConfig
* @param \Magento\App\RequestInterface $request
@@ -113,6 +113,7 @@ class Url extends \Magento\Core\Model\Url
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
* @param \Magento\Backend\Helper\Data $backendHelper
* @param \Magento\Core\Model\Session $session
+ * @param \Magento\Session\SidResolverInterface $sidResolver
* @param Menu\Config $menuConfig
* @param \Magento\Core\Model\App $app
* @param \Magento\Core\Model\StoreManagerInterface $storeManager
@@ -122,6 +123,7 @@ class Url extends \Magento\Core\Model\Url
* @param \Magento\Backend\App\ConfigInterface $config
* @param \Magento\Core\Model\StoreFactory $storeFactory
* @param \Magento\Core\Model\ConfigInterface $coreConfig
+ * @param \Magento\Data\Form\FormKey $formKey
* @param null $areaCode
* @param array $data
*/
@@ -132,6 +134,7 @@ public function __construct(
\Magento\Core\Model\Store\Config $coreStoreConfig,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Core\Model\Session $session,
+ \Magento\Session\SidResolverInterface $sidResolver,
\Magento\Backend\Model\Menu\Config $menuConfig,
\Magento\Core\Model\App $app,
\Magento\Core\Model\StoreManagerInterface $storeManager,
@@ -141,21 +144,30 @@ public function __construct(
\Magento\Backend\App\ConfigInterface $config,
\Magento\Core\Model\StoreFactory $storeFactory,
\Magento\Core\Model\ConfigInterface $coreConfig,
+ \Magento\Data\Form\FormKey $formKey,
$areaCode = null,
array $data = array()
) {
$this->_encryptor = $encryptor;
parent::__construct(
- $routeConfig, $request, $urlSecurityInfo, $coreStoreConfig,
- $app, $storeManager, $session, $areaCode, $data
+ $routeConfig,
+ $request,
+ $urlSecurityInfo,
+ $coreStoreConfig,
+ $app,
+ $storeManager,
+ $session,
+ $sidResolver,
+ $areaCode,
+ $data
);
$this->_config = $config;
$this->_startupMenuItemId = $coreStoreConfig->getConfig(self::XML_PATH_STARTUP_MENU_ITEM);
$this->_backendHelper = $backendHelper;
- $this->_coreSession = $session;
$this->_menuConfig = $menuConfig;
$this->_cache = $cache;
$this->_session = $authSession;
+ $this->formKey = $formKey;
$this->_storeFactory = $storeFactory;
$this->_coreConfig = $coreConfig;
}
@@ -241,7 +253,7 @@ public function getUrl($routePath = null, $routeParams = null)
*/
public function getSecretKey($routeName = null, $controller = null, $action = null)
{
- $salt = $this->_coreSession->getFormKey();
+ $salt = $this->formKey->getFormKey();
$request = $this->getRequest();
if (!$routeName) {
if ($request->getBeforeForwardInfo('route_name') !== null) {
diff --git a/app/code/Magento/Backend/etc/adminhtml/di.xml b/app/code/Magento/Backend/etc/adminhtml/di.xml
index 81f6c2eeb0b10..7d5fcda93e339 100644
--- a/app/code/Magento/Backend/etc/adminhtml/di.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/di.xml
@@ -24,7 +24,6 @@
*/
-->
-
@@ -32,12 +31,10 @@
-
-
@@ -57,31 +54,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- backend_acl_resources
-
-
-
-
- Magento_Adminhtml::all
-
-
adminhtml
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 7c9e596e48445..638faa9da90e1 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -86,6 +86,9 @@
+
+
+
adminhtml
@@ -100,6 +103,34 @@
Magento\App\State::PARAM_INSTALL_DATE
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ backend_acl_resources
+
+
+
+
+ Magento_Adminhtml::all
+
+
diff --git a/app/code/Magento/Backend/etc/module.xml b/app/code/Magento/Backend/etc/module.xml
index aef7d360109c2..1b227ac2789fc 100755
--- a/app/code/Magento/Backend/etc/module.xml
+++ b/app/code/Magento/Backend/etc/module.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/app/code/Magento/Backend/view/adminhtml/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
index 5a63d7d2737d5..af9150cbc8986 100644
--- a/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/admin/login.phtml
@@ -31,8 +31,8 @@
-
-
+
+
@@ -66,7 +66,7 @@
- getMessagesBlock()->getGroupedHtml() ?>
+ getLayout()->getMessagesBlock()->getGroupedHtml() ?>
-
getMessagesBlock()->getGroupedHtml() ?>
+
getLayout()->getMessagesBlock()->getGroupedHtml() ?>
getChildHtml('content') ?>