Skip to content

Commit 518964e

Browse files
mazhalaimazhalai
committed
Merge pull request #80 from magento-ogre/develop-new
[Ogres] Sprint 22 Contribution
2 parents 7e07209 + a172ece commit 518964e

File tree

229 files changed

+5966
-226
lines changed

Some content is hidden

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

229 files changed

+5966
-226
lines changed

‎.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.4
43
- 5.5
54
- 5.6
65
env:
@@ -11,10 +10,6 @@ env:
1110
- TEST_SUITE=static_annotation
1211
matrix:
1312
exclude:
14-
- php: 5.4
15-
env: TEST_SUITE=static_phpcs
16-
- php: 5.4
17-
env: TEST_SUITE=static_annotation
1813
- php: 5.6
1914
env: TEST_SUITE=static_phpcs
2015
- php: 5.6

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
umask(0);
1313

1414
/* PHP version validation */
15-
if (version_compare(phpversion(), '5.4.11', '<') === true) {
15+
if (version_compare(phpversion(), '5.5.0', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or later. ' .
17+
echo 'Magento supports PHP 5.5.0 or later. ' .
1818
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1919
} else {
2020
echo <<<HTML
2121
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
22-
<p>Magento supports PHP 5.4.11 or later. Please read
22+
<p>Magento supports PHP 5.5.0 or later. Please read
2323
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2424
Magento System Requirements</a>.
2525
</div>

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

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

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-backend": "0.42.0-beta6",
77
"magento/module-cron": "0.42.0-beta6",
88
"magento/framework": "0.42.0-beta6",

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta6",
77
"magento/module-catalog": "0.42.0-beta6",
88
"magento/module-tax": "0.42.0-beta6",

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta6",
77
"magento/module-customer": "0.42.0-beta6",
88
"magento/module-checkout": "0.42.0-beta6",

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta6",
77
"magento/module-eav": "0.42.0-beta6",
88
"magento/module-cms": "0.42.0-beta6",

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-core": "0.42.0-beta6",
77
"magento/module-catalog": "0.42.0-beta6",
88
"magento/module-eav": "0.42.0-beta6",

0 commit comments

Comments
 (0)