Skip to content

Commit be1484e

Browse files
author
Yuri Kovsher
committed
Merge branch 'main/develop' into Tango_Pull_Request_Bug_Fixing
Conflicts: app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
2 parents 8910cbc + 1f4cf42 commit be1484e

File tree

16,531 files changed

+33968
-16694
lines changed

Some content is hidden

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

16,531 files changed

+33968
-16694
lines changed

‎.php_cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: php
22
php:
33
- 5.4
44
- 5.5
5+
- 5.6
56
env:
67
- TEST_SUITE=unit
78
- TEST_SUITE=integration
@@ -14,6 +15,10 @@ matrix:
1415
env: TEST_SUITE=static_phpcs
1516
- php: 5.4
1617
env: TEST_SUITE=static_annotation
18+
- php: 5.6
19+
env: TEST_SUITE=static_phpcs
20+
- php: 5.6
21+
env: TEST_SUITE=static_annotation
1722
before_install:
1823
- sudo apt-get update -qq
1924
- sudo apt-get install -y -qq postfix

‎CONTRIBUTOR_LICENSE_AGREEMENT.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!--
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56
-->
67
<!DOCTYPE html>

‎COPYING.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
2+
3+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
4+
Please see <insert file name of the OSL license> for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
5+
6+
Subject to Licensee�s payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
7+
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

‎app/autoload.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Register basic autoloader that uses include path
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
use Magento\Framework\Autoload\AutoloaderRegistry;
89
use Magento\Framework\Autoload\ClassLoaderWrapper;

‎app/bootstrap.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
45
*/
56

67
/**
@@ -13,15 +14,14 @@
1314
/* PHP version validation */
1415
if (version_compare(phpversion(), '5.4.11', '<') === true) {
1516
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
17+
echo 'Magento supports PHP 5.4.11 or later. ' .
18+
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1719
} else {
1820
echo <<<HTML
1921
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
20-
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
21-
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
22-
Whoops, it looks like you have an invalid PHP version.</h3>
23-
</div>
24-
<p>Magento supports PHP 5.4.11 or newer.
22+
<p>Magento supports PHP 5.4.11 or later. Please read
23+
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
24+
Magento System Requirements</a>.
2525
</div>
2626
HTML;
2727
}

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification Severity Renderer
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block\Grid\Renderer;
89

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
/**
33
* Adminhtml AdminNotification inbox grid
44
*
5-
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
5+
* Copyright © 2015 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
namespace Magento\AdminNotification\Block;
89

0 commit comments

Comments
 (0)