Skip to content

Commit 14285b9

Browse files
author
Stanislav Idolov
committed
MAGETWO-84847: Prepare codebase for 2.1.12
1 parent b2fd6f3 commit 14285b9

File tree

122 files changed

+34845
-4437
lines changed

Some content is hidden

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

122 files changed

+34845
-4437
lines changed

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function getHtml()
125125

126126
/**
127127
* @param string|null $index
128-
* @return string
128+
* @return array|string|int|float|null
129129
*/
130130
public function getEscapedValue($index = null)
131131
{
@@ -136,6 +136,11 @@ public function getEscapedValue($index = null)
136136
$this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT)
137137
);
138138
}
139+
140+
if (is_string($value)) {
141+
return $this->escapeHtml($value);
142+
}
143+
139144
return $value;
140145
}
141146

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ public function getHtml()
142142
/**
143143
* Return escaped value for calendar
144144
*
145-
* @param string $index
146-
* @return string
145+
* @param string|null $index
146+
* @return array|string|int|float|null
147147
*/
148148
public function getEscapedValue($index = null)
149149
{
@@ -152,6 +152,11 @@ public function getEscapedValue($index = null)
152152
if ($value instanceof \DateTime) {
153153
return $this->_localeDate->formatDateTime($value);
154154
}
155+
156+
if (is_string($value)) {
157+
return $this->escapeHtml($value);
158+
}
159+
155160
return $value;
156161
}
157162

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,35 @@ class DateTest extends \PHPUnit_Framework_TestCase
3232

3333
protected function setUp()
3434
{
35-
$this->mathRandomMock = $this->getMockBuilder('Magento\Framework\Math\Random')
35+
$this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
3636
->disableOriginalConstructor()
3737
->setMethods(['getUniqueHash'])
3838
->getMock();
3939

40-
$this->localeResolverMock = $this->getMockBuilder('Magento\Framework\Locale\ResolverInterface')
40+
$this->localeResolverMock = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
4141
->disableOriginalConstructor()
4242
->setMethods([])
4343
->getMock();
4444

4545
$this->dateTimeFormatterMock = $this
46-
->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface')
46+
->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface::class)
4747
->disableOriginalConstructor()
4848
->setMethods([])
4949
->getMock();
5050

51-
$this->columnMock = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column')
51+
$this->columnMock = $this->getMockBuilder(\Magento\Backend\Block\Widget\Grid\Column::class)
5252
->disableOriginalConstructor()
5353
->setMethods(['getTimezone', 'getHtmlId', 'getId'])
5454
->getMock();
5555

56-
$this->localeDateMock = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime\TimezoneInterface')
56+
$this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
5757
->disableOriginalConstructor()
5858
->setMethods([])
5959
->getMock();
6060

6161
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
6262
$this->model = $objectManagerHelper->getObject(
63-
'Magento\Backend\Block\Widget\Grid\Column\Filter\Date',
63+
\Magento\Backend\Block\Widget\Grid\Column\Filter\Date::class,
6464
[
6565
'mathRandom' => $this->mathRandomMock,
6666
'localeResolver' => $this->localeResolverMock,

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,35 @@ class DatetimeTest extends \PHPUnit_Framework_TestCase
3232

3333
protected function setUp()
3434
{
35-
$this->mathRandomMock = $this->getMockBuilder('Magento\Framework\Math\Random')
35+
$this->mathRandomMock = $this->getMockBuilder(\Magento\Framework\Math\Random::class)
3636
->disableOriginalConstructor()
3737
->setMethods(['getUniqueHash'])
3838
->getMock();
3939

40-
$this->localeResolverMock = $this->getMockBuilder('Magento\Framework\Locale\ResolverInterface')
40+
$this->localeResolverMock = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
4141
->disableOriginalConstructor()
4242
->setMethods([])
4343
->getMock();
4444

4545
$this->dateTimeFormatterMock = $this
46-
->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface')
46+
->getMockBuilder(\Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface::class)
4747
->disableOriginalConstructor()
4848
->setMethods([])
4949
->getMock();
5050

51-
$this->columnMock = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column')
51+
$this->columnMock = $this->getMockBuilder(\Magento\Backend\Block\Widget\Grid\Column::class)
5252
->disableOriginalConstructor()
5353
->setMethods(['getTimezone', 'getHtmlId', 'getId'])
5454
->getMock();
5555

56-
$this->localeDateMock = $this->getMockBuilder('\Magento\Framework\Stdlib\DateTime\TimezoneInterface')
56+
$this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
5757
->disableOriginalConstructor()
5858
->setMethods([])
5959
->getMock();
6060

6161
$objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
6262
$this->model = $objectManagerHelper->getObject(
63-
'Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime',
63+
\Magento\Backend\Block\Widget\Grid\Column\Filter\Datetime::class,
6464
[
6565
'mathRandom' => $this->mathRandomMock,
6666
'localeResolver' => $this->localeResolverMock,

‎app/code/Magento/Backup/Controller/Adminhtml/Index/Create.php

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
class Create extends \Magento\Backup\Controller\Adminhtml\Index
1313
{
1414
/**
15-
* Create backup action
15+
* Create backup action.
1616
*
1717
* @return void|\Magento\Backend\App\Action
1818
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
1919
*/
2020
public function execute()
2121
{
22-
if (!$this->getRequest()->isAjax()) {
22+
if (!$this->requestAllowed()) {
2323
return $this->_redirect('*/*/index');
2424
}
2525

@@ -28,7 +28,7 @@ public function execute()
2828
/**
2929
* @var \Magento\Backup\Helper\Data $helper
3030
*/
31-
$helper = $this->_objectManager->get('Magento\Backup\Helper\Data');
31+
$helper = $this->_objectManager->get(\Magento\Backup\Helper\Data::class);
3232

3333
try {
3434
$type = $this->getRequest()->getParam('type');
@@ -73,7 +73,7 @@ public function execute()
7373

7474
if ($type != \Magento\Framework\Backup\Factory::TYPE_DB) {
7575
/** @var Filesystem $filesystem */
76-
$filesystem = $this->_objectManager->get('Magento\Framework\Filesystem');
76+
$filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
7777
$backupManager->setRootDir($filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath())
7878
->addIgnorePaths($helper->getBackupIgnorePaths());
7979
}
@@ -88,10 +88,10 @@ public function execute()
8888
} catch (\Magento\Framework\Backup\Exception\NotEnoughFreeSpace $e) {
8989
$errorMessage = __('You need more free space to create a backup.');
9090
} catch (\Magento\Framework\Backup\Exception\NotEnoughPermissions $e) {
91-
$this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
91+
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->info($e->getMessage());
9292
$errorMessage = __('You need more permissions to create a backup.');
9393
} catch (\Exception $e) {
94-
$this->_objectManager->get('Psr\Log\LoggerInterface')->info($e->getMessage());
94+
$this->_objectManager->get(\Psr\Log\LoggerInterface::class)->info($e->getMessage());
9595
$errorMessage = __('We can\'t create the backup right now.');
9696
}
9797

@@ -106,4 +106,14 @@ public function execute()
106106

107107
$this->getResponse()->representJson($response->toJson());
108108
}
109+
110+
/**
111+
* Check if request is allowed.
112+
*
113+
* @return bool
114+
*/
115+
private function requestAllowed()
116+
{
117+
return $this->getRequest()->isAjax() && $this->getRequest()->isPost();
118+
}
109119
}

0 commit comments

Comments
 (0)