Skip to content

Commit 0892213

Browse files
pdohogne-magentopdohogne-magento
committed
Merge remote-tracking branch 'mainline/develop' into Fearless-Kiwis-MAGETWO-63844
2 parents cdefefa + f63b0a1 commit 0892213

File tree

1,328 files changed

+42465
-32301
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,328 files changed

+42465
-32301
lines changed

‎.travis.yml

Lines changed: 8 additions & 4 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
@@ -22,6 +23,12 @@ env:
2223
- TEST_SUITE=integration INTEGRATION_INDEX=3
2324
- TEST_SUITE=static
2425
- TEST_SUITE=js
26+
matrix:
27+
exclude:
28+
- php: 7.0
29+
env: TEST_SUITE=static
30+
- php: 7.0
31+
env: TEST_SUITE=js
2532
cache:
2633
apt: true
2734
directories:
@@ -32,7 +39,4 @@ cache:
3239
before_install: ./dev/travis/before_install.sh
3340
install: composer install --no-interaction --prefer-dist
3441
before_script: ./dev/travis/before_script.sh
35-
script:
36-
- test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
37-
- if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
38-
- if [ $TEST_SUITE == "js" ]; then grunt spec; fi
42+
script: ./dev/travis/script.sh

‎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.*",

0 commit comments

Comments
 (0)