Skip to content

Commit f7b3027

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-32602-static-tests-not-run
2 parents 665316e + 1f4cf42 commit f7b3027

File tree

145 files changed

+1083
-256
lines changed

Some content is hidden

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

145 files changed

+1083
-256
lines changed

‎.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

‎app/bootstrap.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
/* PHP version validation */
1515
if (version_compare(phpversion(), '5.4.11', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
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';
1819
} else {
1920
echo <<<HTML
2021
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
22-
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
23-
Whoops, it looks like you have an invalid PHP version.</h3>
24-
</div>
25-
<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>.
2625
</div>
2726
HTML;
2827
}

‎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.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-core": "0.42.0-beta3",
88
"magento/module-backend": "0.42.0-beta3",

‎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.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-backend": "0.42.0-beta3",
77
"magento/framework": "0.42.0-beta3",
88
"magento/magento-composer-installer": "*"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backend",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-directory": "0.42.0-beta3",
88
"magento/module-core": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backup",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-core": "0.42.0-beta3",
88
"magento/module-backend": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-bundle",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-catalog": "0.42.0-beta3",
88
"magento/module-tax": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-captcha",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-customer": "0.42.0-beta3",
88
"magento/module-checkout": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-catalog",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-eav": "0.42.0-beta3",
88
"magento/module-cms": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-catalog-import-export",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-core": "0.42.0-beta3",
77
"magento/module-catalog": "0.42.0-beta3",
88
"magento/module-eav": "0.42.0-beta3",

0 commit comments

Comments
 (0)