Merge pull request #21 from magento-ogre/develop

[Ogre] Bug fix, Github issues, MAGETWO-32363
magento · Jan 13, 2015 · 2f03eec · 2f03eec
2 parents 12172ea + 6a14ccf
commit 2f03eec
Show file tree

Hide file tree

Showing 103 changed files with 159 additions and 161 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ language: php
 php:
   - 5.4
   - 5.5
+  - 5.6
 env:
   - TEST_SUITE=unit
   - TEST_SUITE=integration
@@ -14,6 +15,10 @@ matrix:
       env: TEST_SUITE=static_phpcs
     - php: 5.4
       env: TEST_SUITE=static_annotation
+    - php: 5.6
+      env: TEST_SUITE=static_phpcs
+    - php: 5.6
+      env: TEST_SUITE=static_annotation
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y -qq postfix

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

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta3",
         "magento/framework": "0.42.0-beta3",
         "magento/magento-composer-installer": "*"

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-backend",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-directory": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-backup",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-tax": "0.42.0-beta3",

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-captcha",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-customer": "0.42.0-beta3",
         "magento/module-checkout": "0.42.0-beta3",

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-eav": "0.42.0-beta3",
         "magento/module-cms": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-import-export",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-eav": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-inventory",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-customer": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-rule": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-search",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-search": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-url-rewrite",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-catalog-import-export": "0.42.0-beta3",

diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-widget",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-widget": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-centinel",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-checkout": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",

diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-checkout",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-sales": "0.42.0-beta3",
         "magento/module-authorization": "0.42.0-beta3",

diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-checkout-agreements",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-checkout": "0.42.0-beta3",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-theme": "0.42.0-beta3",

diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms-url-rewrite",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-cms": "0.42.0-beta3",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-url-rewrite": "0.42.0-beta3",

diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-import-export",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-catalog-import-export": "0.42.0-beta3",
         "magento/module-eav": "0.42.0-beta3",

diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-product",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-catalog-inventory": "0.42.0-beta3",

diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-contact",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-customer": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-core",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",
         "magento/module-cron": "0.42.0-beta3",

diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cron",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",
         "magento/framework": "0.42.0-beta3",

diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-currency-symbol",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-page-cache": "0.42.0-beta3",
         "magento/module-directory": "0.42.0-beta3",

diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-eav": "0.42.0-beta3",
         "magento/module-directory": "0.42.0-beta3",

diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer-import-export",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-backend": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-customer": "0.42.0-beta3",

diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-design-editor",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-theme": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-dhl",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-shipping": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-directory",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",

diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-eav",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-email",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-cms": "0.42.0-beta3",

diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-fedex",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-shipping": "0.42.0-beta3",
         "magento/module-directory": "0.42.0-beta3",

diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-gift-message",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-checkout": "0.42.0-beta3",

diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-adwords",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-sales": "0.42.0-beta3",
         "magento/framework": "0.42.0-beta3",

diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-analytics",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-sales": "0.42.0-beta3",
         "magento/framework": "0.42.0-beta3",

diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-optimizer",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-google-analytics": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",

diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-google-shopping",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-core": "0.42.0-beta3",
         "magento/module-backend": "0.42.0-beta3",

diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-import-export",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-import-export": "0.42.0-beta3",
         "magento/module-catalog-import-export": "0.42.0-beta3",

diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-product",
     "description": "N/A",
     "require": {
-        "php": "~5.4.11|~5.5.0",
+        "php": "~5.4.11|~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta3",
         "magento/module-catalog": "0.42.0-beta3",
         "magento/module-catalog-inventory": "0.42.0-beta3",