Skip to content

Commit cbe3fca

Browse files
author
Oleksii Korshenko
committed
MAGETWO-81325: Fix magento#9243 - Upgrade ZF components. Zend_Service magento#11291
- Merge Pull Request magento#11291 from dverkade/magento2:Upgrade_ZF_components._Zend_Service - Merged commits: 1. ffd2412
2 parents 14e7a37 + ffd2412 commit cbe3fca

File tree

9,606 files changed

+122709
-113612
lines changed

Some content is hidden

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

9,606 files changed

+122709
-113612
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,6 @@ script:
5959
- test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
6060

6161
# The scripts for grunt/phpunit type tests
62-
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
62+
- if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
63+
- if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
6364
- if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262

6363
date_default_timezone_set('UTC');
6464

65-
/* Adjustment of precision value for several versions of PHP */
66-
ini_set('precision', 17);
67-
ini_set('serialize_precision', 17);
65+
/* For data consistency between displaying (printing) and serialization a float number */
66+
ini_set('precision', 14);
67+
ini_set('serialize_precision', 14);

app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1415
{

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1415
{

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @api
1313
* @author Magento Core Team <[email protected]>
14+
* @since 100.0.2
1415
*/
1516
class ToolbarEntry extends \Magento\Backend\Block\Template
1617
{

app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Window extends \Magento\Backend\Block\Template
1415
{

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
abstract class Notification extends \Magento\Backend\App\AbstractAction
1415
{

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

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

99
class ListAction extends \Magento\Backend\App\AbstractAction
1010
{
11+
/**
12+
* Authorization level of a basic admin session
13+
*/
14+
const ADMIN_RESOURCE = 'Magento_AdminNotification::show_list';
15+
1116
/**
1217
* @var \Magento\Framework\Json\Helper\Data
1318
*/

app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @codeCoverageIgnore
1212
* @api
13+
* @since 100.0.2
1314
*/
1415
class Frequency implements \Magento\Framework\Option\ArrayInterface
1516
{

app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* @author Magento Core Team <[email protected]>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1515
* @api
16+
* @since 100.0.2
1617
*/
1718
class Feed extends \Magento\Framework\Model\AbstractModel
1819
{
@@ -147,9 +148,9 @@ public function checkUpdate()
147148
$feedData[] = [
148149
'severity' => (int)$item->severity,
149150
'date_added' => date('Y-m-d H:i:s', $itemPublicationDate),
150-
'title' => (string)$item->title,
151-
'description' => (string)$item->description,
152-
'url' => (string)$item->link,
151+
'title' => $this->escapeString($item->title),
152+
'description' => $this->escapeString($item->description),
153+
'url' => $this->escapeString($item->link),
153154
];
154155
}
155156
}
@@ -245,4 +246,15 @@ public function getFeedXml()
245246

246247
return $xml;
247248
}
249+
250+
/**
251+
* Converts incoming data to string format and escapes special characters.
252+
*
253+
* @param \SimpleXMLElement $data
254+
* @return string
255+
*/
256+
private function escapeString(\SimpleXMLElement $data)
257+
{
258+
return htmlspecialchars((string)$data);
259+
}
248260
}

0 commit comments

Comments
 (0)