Skip to content

Commit e8397f2

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents eca03f1 + e6bd3ea commit e8397f2

File tree

1,193 files changed

+7180
-2813
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,193 files changed

+7180
-2813
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 <[email protected]>
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 <[email protected]>
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.*",

‎app/code/Magento/Authorization/Model/Role.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Admin Role Model
1010
*
11+
* @api
1112
* @method \Magento\Authorization\Model\ResourceModel\Role _getResource()
1213
* @method \Magento\Authorization\Model\ResourceModel\Role getResource()
1314
* @method int getParentId()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
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/framework": "100.2.*"
88
},

‎app/code/Magento/Authorizenet/Block/Adminhtml/Order/View/Info/FraudDetails.php

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

88
use Magento\Authorizenet\Model\Directpost;
99

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

‎app/code/Magento/Authorizenet/Block/Transparent/Iframe.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Magento\Payment\Block\Transparent\Iframe as TransparentIframe;
99

1010
/**
11-
* Class Iframe
11+
* @api
1212
*/
1313
class Iframe extends TransparentIframe
1414
{

‎app/code/Magento/Authorizenet/Helper/Backend/Data.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
/**
1515
* Authorize.net Backend Data Helper
16+
*
17+
* @api
1618
*/
1719
class Data extends FrontendDataHelper
1820
{

‎app/code/Magento/Authorizenet/Helper/Data.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
/**
1616
* Authorize.net Data Helper
17+
*
18+
* @api
1719
*/
1820
class Data extends AbstractHelper
1921
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorizenet",
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-sales": "100.2.*",
77
"magento/module-store": "100.2.*",
88
"magento/module-quote": "100.2.*",

‎app/code/Magento/Backend/Block/Admin/Formkey.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
*/
1010
namespace Magento\Backend\Block\Admin;
1111

12+
/**
13+
* @api
14+
*/
1215
class Formkey extends \Magento\Backend\Block\Template
1316
{
1417
/**

‎app/code/Magento/Backend/Block/Cache.php

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

8+
/**
9+
* @api
10+
*/
811
class Cache extends \Magento\Backend\Block\Widget\Grid\Container
912
{
1013
/**

‎app/code/Magento/Backend/Block/Cache/Additional.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\Cache;
77

8+
/**
9+
* @api
10+
*/
811
class Additional extends \Magento\Backend\Block\Template
912
{
1013
/**

‎app/code/Magento/Backend/Block/Cache/Grid/Column/Statuses.php

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

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

‎app/code/Magento/Backend/Block/Dashboard.php

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

99
namespace Magento\Backend\Block;
1010

11+
/**
12+
* @api
13+
*/
1114
class Dashboard extends \Magento\Backend\Block\Template
1215
{
1316
/**

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Adminhtml dashboard most active buyers
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1313
*/
1414
class Most extends \Magento\Backend\Block\Dashboard\Grid

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
/**
99
* Adminhtml dashboard most recent customers grid
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @SuppressWarnings(PHPMD.DepthOfInheritance)
12+
* @api
1313
*/
1414
class Newest extends \Magento\Backend\Block\Dashboard\Grid
1515
{

‎app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Adminhtml dashboard most viewed products grid
1313
*
14-
* @author Magento Core Team <[email protected]>
14+
* @api
1515
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1616
*/
1717
class Viewed extends \Magento\Backend\Block\Dashboard\Grid

‎app/code/Magento/Backend/Block/Denied.php

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

8+
/**
9+
* @api
10+
*/
811
class Denied extends \Magento\Backend\Block\Template
912
{
1013
/**

‎app/code/Magento/Backend/Block/GlobalSearch.php

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

8+
/**
9+
* @api
10+
*/
811
class GlobalSearch extends \Magento\Backend\Block\Template
912
{
1013
/**

‎app/code/Magento/Backend/Block/Menu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/**
1212
* Backend menu block
1313
*
14+
* @api
1415
* @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
1516
* @method array getAdditionalCacheKeyInfo()
1617
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)

‎app/code/Magento/Backend/Block/Page.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\Backend\Block;
1313

14+
/**
15+
* @api
16+
*/
1417
class Page extends \Magento\Backend\Block\Template
1518
{
1619
/**

‎app/code/Magento/Backend/Block/Page/Copyright.php

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

88
/**
99
* Copyright footer block
10+
*
11+
* @api
1012
*/
1113
class Copyright extends \Magento\Backend\Block\Template
1214
{

‎app/code/Magento/Backend/Block/Page/Footer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Adminhtml footer block
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Footer extends \Magento\Backend\Block\Template

‎app/code/Magento/Backend/Block/Page/Header.php

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

‎app/code/Magento/Backend/Block/Page/Notices.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
*/
1414
namespace Magento\Backend\Block\Page;
1515

16+
/**
17+
* @api
18+
*/
1619
class Notices extends \Magento\Backend\Block\Template
1720
{
1821
/**

‎app/code/Magento/Backend/Block/Page/RequireJs.php

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

99
/**
1010
* Require Js block
11+
*
12+
* @api
1113
*/
1214
class RequireJs extends \Magento\Framework\View\Element\Template
1315
{

‎app/code/Magento/Backend/Block/Store/Switcher.php

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

99
/**
1010
* Store switcher block
11+
*
12+
* @api
1113
*/
1214
class Switcher extends \Magento\Backend\Block\Template
1315
{

‎app/code/Magento/Backend/Block/System/Account/Edit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Adminhtml edit admin user account
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Edit extends \Magento\Backend\Block\Widget\Form\Container

‎app/code/Magento/Backend/Block/System/Design.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\System;
77

8+
/**
9+
* @api
10+
*/
811
class Design extends \Magento\Backend\Block\Template
912
{
1013
/**

‎app/code/Magento/Backend/Block/System/Store/Store.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Adminhtml store content block
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Store extends \Magento\Backend\Block\Widget\Grid\Container

‎app/code/Magento/Backend/Block/Template.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Backend abstract block
1010
*
11+
* @api
1112
* @SuppressWarnings(PHPMD.NumberOfChildren)
1213
*/
1314
class Template extends \Magento\Framework\View\Element\Template

‎app/code/Magento/Backend/Block/Widget/Breadcrumbs.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Magento_Backend page breadcrumbs
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Breadcrumbs extends \Magento\Backend\Block\Template

‎app/code/Magento/Backend/Block/Widget/Button.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Button widget
1010
*
11+
* @api
1112
* @author Magento Core Team <[email protected]>
1213
*/
1314
class Button extends \Magento\Backend\Block\Widget

‎app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

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

77
namespace Magento\Backend\Block\Widget\Button;
88

9+
/**
10+
* @api
11+
*/
912
class ButtonList
1013
{
1114
/**

‎app/code/Magento/Backend/Block/Widget/Button/Item.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Backend\Block\Widget\Button;
88

99
/**
10+
* @api
1011
* @method string getButtonKey()
1112
* @method string getRegion()
1213
* @method string getName()

0 commit comments

Comments
 (0)