Skip to content

Commit a9e5fc9

Browse files
ishakhsuvarovishakhsuvarov
committed
MAGETWO-68769: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-68769-PR-9409
2 parents b375fd4 + 62667cb commit a9e5fc9

File tree

1,113 files changed

+7323
-2183
lines changed

Some content is hidden

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

1,113 files changed

+7323
-2183
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ addons:
1010
language: php
1111
php:
1212
- 7.0
13+
- 7.1
1314
env:
1415
global:
1516
- COMPOSER_BIN_DIR=~/bin

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50605 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
14+
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
16+
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
1717
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
21+
<p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
2222
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2323
Magento System Requirements</a>.
2424
</div>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Block;
99

10+
/**
11+
* @api
12+
*/
1013
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1114
{
1215
/**

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Framework\Notification\MessageInterface;
99

10+
/**
11+
* @api
12+
*/
1013
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1114
{
1215
/**

‎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
* Toolbar entry that shows latest notifications
1313
*
14+
* @api
1415
* @author Magento Core Team <core@magentocommerce.com>
1516
*/
1617
class ToolbarEntry extends \Magento\Backend\Block\Template

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Block;
99

10+
/**
11+
* @api
12+
*/
1013
class Window extends \Magento\Backend\Block\Template
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* AdminNotification Inbox model
1010
*
11+
* @api
1112
* @author Magento Core Team <core@magentocommerce.com>
1213
*/
1314
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
5+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
5+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-catalog": "101.1.*",
77
"magento/module-catalog-inventory": "100.2.*",
88
"magento/module-eav": "100.2.*",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-analytics",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
5+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-backend": "100.2.*",
77
"magento/module-config": "100.2.*",
88
"magento/module-integration": "100.2.*",

0 commit comments

Comments
 (0)