diff --git a/.travis.yml b/.travis.yml index 3b0108dd1abc7..75d26bdfa7d10 100644 --- 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 index 07ef94f833e4a..183edeceabf33 100644 --- 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 << -
-

- Whoops, it looks like you have an invalid PHP version.

-
-

Magento supports PHP 5.4.11 or newer. +

Magento supports PHP 5.4.11 or later. Please read + + Magento System Requirements. HTML; } diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index e9b5b30c4b27a..772dd77e5093f 100644 --- 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 index 7bd18ed1f9e5a..46060369cb7e6 100644 --- 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 index f4d31d310a34b..b1d54364d381f 100644 --- 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 index ace6f3a147b3d..87a0225e86690 100644 --- 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 index a599817ab17e3..8580562292cb8 100644 --- 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 index 7150fa76fd655..5cd84ce402336 100644 --- 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 index 91175da5e7367..360e14b27de53 100644 --- 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 index eeb8648ddd4ca..b494e210bef94 100644 --- 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 index e8f04fc3a78e2..c226936f18f7b 100644 --- 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 index 969c2d6fe508b..77813109ca80a 100644 --- 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 index cdf03092c052b..1820067884907 100644 --- 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 index 6fe7f7bf36502..51e3cb2ed671e 100644 --- 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 index fd48c7c899588..0c728e7ef139c 100644 --- 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 index cb24895c5bef8..23ce3a4a76fa1 100644 --- 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 index 5ff87c86c62da..5571403235562 100644 --- 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 index 90429b6faec2f..0e41b386f1a71 100644 --- 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 index c1b4f3cb82ba0..1bab1473f233a 100644 --- 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 index e5f0e68d9e21a..8566a9d1e0b73 100644 --- 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 index 1ec2eb7039530..350b1f9762dae 100644 --- 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 index 36971f7dbd7a9..40614acdc7e88 100644 --- 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 index 7b8189d62e197..e746193309c4f 100644 --- 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 index 72ba792362df4..3d356da4d534d 100644 --- 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 index c3cdb1c2c8172..5d0310756d4a3 100644 --- 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 index 4853345442d1a..fe027d918ba32 100644 --- 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 index 82de4e2d55c2e..6a8f9941fef46 100644 --- 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 index 8c75a2a8de2a2..286d4febae3a2 100644 --- 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 index f5b72a0874ab3..356553a6cc3b6 100644 --- 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 index b2e95071a8a03..c9d78cbed3b5a 100644 --- 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 index 088239d85ec08..58c7f5ad1dda2 100644 --- 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 index 466cd720eb5ae..c8c0562e88873 100644 --- 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 index 21bcb29c6c088..c60d271e7cf02 100644 --- 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 index 240a491b71ecf..9afda3f5b33af 100644 --- 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 index 88de88ae2fae4..c4bb50094eda0 100644 --- 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 index 3ecf20cb4c879..2f330a2b6f519 100644 --- 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 index 56844a6388978..0e10e7361b8b5 100644 --- 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 index 8670a99b812d9..ad2a5c677de09 100644 --- 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 index 19d885ce706a0..6f3640d73b6b3 100644 --- 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 index 8423766d54ee5..38e35843f414a 100644 --- 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 index 8516d96ce021c..f53791499fbd2 100644 --- 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 index 29b4d88ed9369..d276a035dacf7 100644 --- 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", diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index eff9685455645..89e4b1aab9805 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-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-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/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 37888cf563d46..98cc0400270d6 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-indexer", "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-page-cache": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index e338720c70a04..39da0e6194a83 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-integration", "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/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 49573c19c395f..a4cf2dc2cef49 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-layered-navigation", "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-backend": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 0d6c624364076..4bf9ba061b87f 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-log", "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-customer": "0.42.0-beta3", diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index bdb16ee62dd3f..3d83446f5e40c 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-msrp", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-bundle": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index dd36c4b2060c4..756598d1fa2a9 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-multishipping", "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-checkout": "0.42.0-beta3", diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index b27b3b6fcfb71..4c9e57f393230 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-newsletter", "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-customer": "0.42.0-beta3", diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 9b5d5235860fe..ebd7adb688e87 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-payments", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-payment": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index e9e7ef8f54fb3..f233c74afbce1 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-offline-shipping", "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-shipping": "0.42.0-beta3", diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index b3041fb04b4bb..ea05fb95664ae 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-page-cache", "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/Payment/composer.json b/app/code/Magento/Payment/composer.json index cc11964c6765c..1f55fcdc3a829 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-payment", "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-sales": "0.42.0-beta3", diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index cba2e8d19e77e..022dc88e2fc3d 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-persistent", "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/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index f467753113522..b001db5d77d92 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-product-alert", "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/Reports/composer.json b/app/code/Magento/Reports/composer.json index 4b4917b2b885e..817eb609ddfed 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-reports", "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-customer": "0.42.0-beta3", diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index 549d96bb95fa3..4c029c1c34159 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-require-js", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index c880a35a57661..ec6e7e8629c79 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-review", "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/Rss/composer.json b/app/code/Magento/Rss/composer.json index b094f07e3c2ee..74952b18d3133 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-rss", "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/Rule/composer.json b/app/code/Magento/Rule/composer.json index f6329429fd35d..023d077408adc 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-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-eav": "0.42.0-beta3", "magento/module-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 7d8b5af849848..dd52c6dec79cb 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales", "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/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 01578977b6d0a..0bc6963fbfe82 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sales-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/Search/composer.json b/app/code/Magento/Search/composer.json index 14b98f899019a..3b6df7b57463c 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-search", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index a88aa094e39d4..79e1041b4822d 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sendfriend", "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/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 4b5b85bf70fac..08a1e9d7969cd 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-shipping", "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-catalog": "0.42.0-beta3", diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 9855debc8e8dd..b22d1586a32d6 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-sitemap", "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/Store/composer.json b/app/code/Magento/Store/composer.json index 4533617012e78..e089091493ed4 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-store", "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-directory": "0.42.0-beta3", "magento/module-ui": "0.42.0-beta3", diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index ab8e020070b34..5c54feeea3e74 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax", "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/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 918d877d1dbab..d49ee464fd3e6 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-tax-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-tax": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-directory": "0.42.0-beta3", diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 0326e580986db..9b67f6efa161a 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-theme", "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-customer": "0.42.0-beta3", diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 6e4e8611f7d04..259dadd131c12 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-translation", "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-store": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index 5cf8c3a3c1c09..efe3403132d45 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ui", "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-store": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 29d0e8402b6e1..42d5f994aeb4d 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-ups", "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/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 45565518903cb..a108f1b23a17f 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-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-catalog": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", "magento/module-store": "0.42.0-beta3", diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index b99e2d40a5cf5..4bfac9339fc56 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-user", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/module-authorization": "0.42.0-beta3", "magento/module-backend": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 65df78205d6dd..b7c72cec3da72 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-usps", "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/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 6802e87bff62d..755ecba204525 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-webapi", "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-authorization": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index 6e5f5cc7355f1..fb0b9a6779c99 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-weee", "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/Widget/composer.json b/app/code/Magento/Widget/composer.json index 699c31660c5d8..3a4c1b875c684 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-widget", "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-cms": "0.42.0-beta3", "magento/module-core": "0.42.0-beta3", diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index c2cfe413a8556..d6dc5b534083e 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-wishlist", "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-catalog": "0.42.0-beta3", diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index 7f95ddc97973c..95c694e034fba 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-adminhtml-backend", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index d906616da07e3..f6da390cca977 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-blank", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" }, diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index d0ac21fd996b3..3c8c3377313a6 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -2,7 +2,7 @@ "name": "magento/theme-frontend-luma", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/theme-frontend-blank": "0.42.0-beta3", "magento/framework": "0.42.0-beta3", "magento/magento-composer-installer": "*" diff --git a/composer.json b/composer.json index a801c20718984..f7f2c094298ce 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "zendframework/zend-stdlib": "2.3.1", "zendframework/zend-code": "2.3.1", "zendframework/zend-server": "2.3.1", diff --git a/composer.lock b/composer.lock index b2d6cf8b9bd13..f91dcc508eef9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "19eac8fd6ecb4a7868d40ea31ad2a62b", + "hash": "0ea0b1b2f6f0a7fb58a4780375a1a440", "packages": [ { "name": "composer/composer", @@ -3143,8 +3143,9 @@ "phpmd/phpmd": 0 }, "prefer-stable": false, + "prefer-lowest": false, "platform": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "platform-dev": { "lib-libxml": "*", diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json index ba3e319204ac8..4fe637e35fcd3 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer1.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "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.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json index 3b45c34a4994f..a7b58c71e34c7 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer2.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "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.1.0-alpha103", "magento/module-module3": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json index 9501dd68bb121..4619c88460d9b 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer3.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0" + "php": "~5.4.11|~5.5.0|~5.6.0" }, "type": "magento2-module", "version": "0.1.0-alpha103" diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json index 723f4f9e6cdf5..441ed7e5af1aa 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer4.json @@ -2,7 +2,7 @@ "name": "magento/module-module1", "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.1.0-alpha103", "magento/module-module2": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json index 8df20906f117c..a630787a56681 100644 --- a/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json +++ b/dev/tests/integration/testsuite/Magento/Test/Tools/Dependency/_files/composer5.json @@ -2,7 +2,7 @@ "name": "magento/module-module2", "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.1.0-alpha103", "magento/module-module1": "0.1.0-alpha103" }, diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json index 16bcf44b85c2c..4a5c0d27cd304 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json +++ b/dev/tests/integration/testsuite/Magento/Widget/_files/design/adminhtml/magento_basic/composer.json @@ -2,7 +2,7 @@ "name": "magento/admin-Magento_Catalog", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json index fa9ae3e082f96..1d60a88e8431e 100644 --- a/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json +++ b/dev/tests/unit/testsuite/Magento/Core/Model/_files/frontend/magento_iphone/composer.json @@ -2,7 +2,7 @@ "name": "magento/frontend-magento_iphone", "description": "N/A", "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "magento/framework": "0.1.0-alpha103", "magento/magento-composer-installer": "*" }, diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php index ee5d58e7b0e8f..8276e53d7bee5 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/App/DeploymentConfig/BackendConfigTest.php @@ -24,11 +24,20 @@ public function testGetData() * @expectedException \InvalidArgumentException * @expectedExceptionMessage No backend frontname provided. */ - public function testEmptyData() + public function testUnsetData() { new BackendConfig([]); } + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage No backend frontname provided. + */ + public function testEmptyData() + { + new BackendConfig(['frontName' => '']); + } + /** * @param array $data * @dataProvider invalidDataDataProvider diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php index a7e953bfb2724..ad7a05c05ced9 100644 --- a/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php +++ b/dev/tests/unit/testsuite/Magento/Framework/App/SetupInfoTest.php @@ -181,6 +181,14 @@ public function isAvailableDataProvider() ], false ], + 'root within doc root, existent sub-directory, trailing slash' => [ + [ + 'DOCUMENT_ROOT' => dirname(__DIR__) . DIRECTORY_SEPARATOR, + 'SCRIPT_FILENAME' => __FILE__, + SetupInfo::PARAM_NOT_INSTALLED_URL_PATH => '_files' + ], + true + ], ]; } } diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php index e0cee2273c40d..20b3f461ceff2 100644 --- a/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php +++ b/lib/internal/Magento/Framework/App/DeploymentConfig/BackendConfig.php @@ -26,7 +26,7 @@ class BackendConfig extends AbstractSegment */ public function __construct(array $data) { - if (!isset($data[self::KEY_FRONTNAME])) { + if (empty($data[self::KEY_FRONTNAME])) { throw new \InvalidArgumentException("No backend frontname provided."); } if (!preg_match('/^[a-zA-Z0-9_]+$/', $data[self::KEY_FRONTNAME])) { diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php index 308608a6b9a31..06ce29f02930b 100644 --- a/lib/internal/Magento/Framework/App/SetupInfo.php +++ b/lib/internal/Magento/Framework/App/SetupInfo.php @@ -57,7 +57,7 @@ public function __construct($server, $projectRoot = '') if (empty($server['DOCUMENT_ROOT'])) { throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.'); } - $this->docRoot = str_replace('\\', '/', $server['DOCUMENT_ROOT']); + $this->docRoot = rtrim(str_replace('\\', '/', $server['DOCUMENT_ROOT']), '/'); $this->projectRoot = $projectRoot ?: $this->detectProjectRoot(); $this->projectRoot = str_replace('\\', '/', $this->projectRoot); } diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 5c9e7d0b86e1e..d8dde599d2fa1 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -8,7 +8,7 @@ "AFL-3.0" ], "require": { - "php": "~5.4.11|~5.5.0", + "php": "~5.4.11|~5.5.0|~5.6.0", "ext-spl": "*", "ext-dom": "*", "ext-simplexml": "*", diff --git a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php index 99ab8fd4e58c4..0f5f911bd1626 100644 --- a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php +++ b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php @@ -20,14 +20,23 @@ class DatabaseCheck extends AbstractActionController */ private $installerFactory; + /** + * WebLogger to access log + * + * @var WebLogger + */ + private $webLogger; + /** * Constructor * * @param InstallerFactory $installerFactory + * @param WebLogger $webLogger */ - public function __construct(InstallerFactory $installerFactory) + public function __construct(InstallerFactory $installerFactory, WebLogger $webLogger) { $this->installerFactory = $installerFactory; + $this->webLogger = $webLogger; } /** @@ -39,7 +48,7 @@ public function indexAction() { $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY); try { - $installer = $this->installerFactory->create(new WebLogger()); + $installer = $this->installerFactory->create($this->webLogger); $password = isset($params['password']) ? $params['password'] : ''; $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password); return new JsonModel(['success' => true]); diff --git a/setup/module/Magento/Setup/src/Model/WebLogger.php b/setup/module/Magento/Setup/src/Model/WebLogger.php index 5ffb080f9a5e1..eaf8db5f9a60a 100644 --- a/setup/module/Magento/Setup/src/Model/WebLogger.php +++ b/setup/module/Magento/Setup/src/Model/WebLogger.php @@ -6,6 +6,9 @@ namespace Magento\Setup\Model; +use Magento\Framework\App\Filesystem\DirectoryList; +use Magento\Framework\Filesystem; + /** * Web UI Logger * @@ -23,16 +26,16 @@ class WebLogger implements LoggerInterface /** * Currently open file resource * - * @var resource + * @var Filesystem */ - protected $resource; + protected $filesystem; /** - * Whether the log contains an error message + * Currently open file resource * - * @var bool + * @var \Magento\Framework\Filesystem\Directory\WriteInterface */ - protected $hasError = false; + protected $directory; /** * Indicator of whether inline output is started @@ -43,31 +46,15 @@ class WebLogger implements LoggerInterface /** * Constructor + * @param Filesystem $filesystem + * @param string $logFile */ - public function __construct() + public function __construct(Filesystem $filesystem, $logFile = null) { - $this->logFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $this->logFile; - } - - /** - * Opens log file in the specified mode - * - * @param string $mode - * @return void - */ - private function open($mode) - { - $this->resource = fopen($this->logFile, $mode); - } - - /** - * Closes the log file - * - * @return void - */ - private function close() - { - fclose($this->resource); + $this->directory = $filesystem->getDirectoryWrite(DirectoryList::LOG); + if ($logFile) { + $this->logFile = $logFile; + } } /** @@ -123,19 +110,7 @@ public function logMeta($message) */ private function writeToFile($message) { - $this->open('a+'); - fwrite($this->resource, $message); - $this->close(); - } - - /** - * Whether there is an error in the log - * - * @return bool - */ - public function hasError() - { - return $this->hasError; + $this->directory->writeFile($this->logFile, $message, 'a+'); } /** @@ -145,17 +120,8 @@ public function hasError() */ public function get() { - $this->open('r+'); - fseek($this->resource, 0); - $messages = []; - while (($string = fgets($this->resource)) !== false) { - if (strpos($string, '[ERROR]') !== false) { - $this->hasError = true; - } - $messages[] = $string; - } - $this->close(); - return $messages; + $fileContents = explode('\n', $this->directory->readFile($this->logFile)); + return $fileContents; } /** @@ -165,8 +131,8 @@ public function get() */ public function clear() { - if (file_exists($this->logFile)) { - unlink($this->logFile); + if ($this->directory->isExist($this->logFile)) { + $this->directory->delete($this->logFile); } } diff --git a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml index b60b449e1ed93..1da49ed908e4f 100644 --- a/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml +++ b/setup/module/Magento/Setup/view/magento/setup/customize-your-store.phtml @@ -17,7 +17,8 @@

-

Using sample of "fake" data can be helpful, letting you automatically build your store with fictious products, tax, and payment settings. But it also creates a lot of extra data you need to remove later. Learn the pros and cons in out Guide to Using Sample Data.

+

+ Select “Use Sample Data" to create a sample store with sample products, customers, and payment settings. Our Guide to Using Sample Data can help you get started.

diff --git a/setup/pub/magento/setup/landing.js b/setup/pub/magento/setup/landing.js index 4a49398e72980..c6539b54de37e 100644 --- a/setup/pub/magento/setup/landing.js +++ b/setup/pub/magento/setup/landing.js @@ -10,6 +10,7 @@ angular.module('landing', ['ngStorage']) '$location', '$localStorage', function ($scope, $location, $localStorage) { + $localStorage.$reset(); $scope.selectLanguage = function () { $localStorage.lang = $scope.modelLanguage; window.location = 'index.php/' + $scope.modelLanguage + '/index'; diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js index 177cb0ccd421a..054a8378905a1 100644 --- a/setup/pub/magento/setup/main.js +++ b/setup/pub/magento/setup/main.js @@ -5,8 +5,7 @@ 'use strict'; var main = angular.module('main', ['ngStorage']); -main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', '$localStorage', function ($scope, $state, $rootScope, navigationService, $localStorage) { - $localStorage.$reset(); +main.controller('navigationController', ['$scope', '$state', '$rootScope', 'navigationService', function ($scope, $state, $rootScope, navigationService) { navigationService.load(); $rootScope.isMenuEnabled = true; $scope.itemStatus = function (order) {