From 9666070bd190a1095e3c776b4f2a0f4f8bcac497 Mon Sep 17 00:00:00 2001
From: Oleksii Korshenko <okorshenko@magento.com>
Date: Tue, 25 Oct 2016 14:48:38 -0500
Subject: [PATCH] MAGETWO-60073: Functional Improvements for Magento 2.2-dev
---
app/bootstrap.php | 17 +-
.../Magento/AdminNotification/composer.json | 2 +-
.../AdvancedPricingImportExport/composer.json | 2 +-
app/code/Magento/Authorization/composer.json | 2 +-
app/code/Magento/Authorizenet/composer.json | 2 +-
app/code/Magento/Backend/composer.json | 2 +-
app/code/Magento/Backup/composer.json | 2 +-
app/code/Magento/Braintree/composer.json | 2 +-
app/code/Magento/Bundle/composer.json | 2 +-
.../Magento/BundleImportExport/composer.json | 2 +-
.../Magento/CacheInvalidate/composer.json | 2 +-
app/code/Magento/Captcha/composer.json | 2 +-
app/code/Magento/Catalog/composer.json | 2 +-
.../Magento/CatalogImportExport/composer.json | 2 +-
.../Magento/CatalogInventory/composer.json | 2 +-
app/code/Magento/CatalogRule/composer.json | 2 +-
.../CatalogRuleConfigurable/composer.json | 2 +-
app/code/Magento/CatalogSearch/composer.json | 2 +-
.../Magento/CatalogUrlRewrite/composer.json | 2 +-
app/code/Magento/CatalogWidget/composer.json | 2 +-
.../Magento/Checkout/Controller/Cart/Add.php | 1 +
app/code/Magento/Checkout/Model/Cart.php | 30 ++-
.../Checkout/Model/Cart/RequestInfoFilter.php | 44 ++++
.../Model/Cart/RequestInfoFilterComposite.php | 41 ++++
.../Model/Cart/RequestInfoFilterInterface.php | 21 ++
.../GuestPaymentInformationManagement.php | 28 +++
.../Model/PaymentInformationManagement.php | 28 +++
.../Cart/RequestInfoFilterCompositeTest.php | 73 ++++++
.../Unit/Model/Cart/RequestInfoFilterTest.php | 52 +++++
.../Checkout/Test/Unit/Model/CartTest.php | 216 +++++++++++++++++-
.../GuestPaymentInformationManagementTest.php | 34 ++-
.../PaymentInformationManagementTest.php | 33 ++-
app/code/Magento/Checkout/composer.json | 2 +-
app/code/Magento/Checkout/etc/di.xml | 16 ++
app/code/Magento/Checkout/etc/frontend/di.xml | 8 +
.../Magento/CheckoutAgreements/composer.json | 2 +-
.../Listing/Column/BlockActionsTest.php | 134 +++++++++++
.../Listing/Column/PageActionsTest.php | 21 +-
.../Component/Listing/Column/BlockActions.php | 29 ++-
.../Component/Listing/Column/PageActions.php | 29 ++-
app/code/Magento/Cms/composer.json | 2 +-
app/code/Magento/Cms/i18n/en_US.csv | 6 +-
app/code/Magento/CmsUrlRewrite/composer.json | 2 +-
app/code/Magento/Config/composer.json | 2 +-
.../ConfigurableImportExport/composer.json | 2 +-
.../Magento/ConfigurableProduct/composer.json | 2 +-
app/code/Magento/Contact/composer.json | 2 +-
app/code/Magento/Cookie/composer.json | 2 +-
app/code/Magento/Cron/composer.json | 2 +-
app/code/Magento/CurrencySymbol/composer.json | 2 +-
.../Customer/Controller/Section/Load.php | 23 +-
app/code/Magento/Customer/composer.json | 2 +-
.../CustomerImportExport/composer.json | 2 +-
app/code/Magento/Deploy/composer.json | 2 +-
app/code/Magento/Developer/composer.json | 2 +-
app/code/Magento/Dhl/composer.json | 2 +-
app/code/Magento/Directory/composer.json | 2 +-
app/code/Magento/Downloadable/composer.json | 2 +-
.../DownloadableImportExport/composer.json | 2 +-
.../ResourceModel/Entity/AttributeTest.php | 2 +-
app/code/Magento/Eav/composer.json | 2 +-
app/code/Magento/Email/composer.json | 2 +-
app/code/Magento/EncryptionKey/composer.json | 2 +-
app/code/Magento/Fedex/composer.json | 2 +-
app/code/Magento/GiftMessage/composer.json | 2 +-
app/code/Magento/GoogleAdwords/composer.json | 2 +-
.../Magento/GoogleAnalytics/composer.json | 2 +-
.../Magento/GoogleOptimizer/composer.json | 2 +-
.../Magento/GroupedImportExport/composer.json | 2 +-
app/code/Magento/GroupedProduct/composer.json | 2 +-
app/code/Magento/ImportExport/composer.json | 2 +-
app/code/Magento/Indexer/composer.json | 2 +-
app/code/Magento/Integration/composer.json | 2 +-
.../Magento/LayeredNavigation/composer.json | 2 +-
app/code/Magento/Marketplace/composer.json | 2 +-
app/code/Magento/MediaStorage/composer.json | 2 +-
app/code/Magento/Msrp/composer.json | 2 +-
app/code/Magento/Multishipping/composer.json | 2 +-
.../Magento/NewRelicReporting/composer.json | 2 +-
app/code/Magento/Newsletter/composer.json | 2 +-
.../OfflinePayments/Block/Info/Checkmo.php | 13 +-
.../Test/Unit/Block/Info/CheckmoTest.php | 91 +++++---
.../Magento/OfflinePayments/composer.json | 2 +-
.../adminhtml/templates/info/checkmo.phtml | 2 +-
.../templates/info/pdf/checkmo.phtml | 2 +-
.../frontend/templates/info/checkmo.phtml | 2 +-
.../Magento/OfflineShipping/composer.json | 2 +-
app/code/Magento/PageCache/composer.json | 2 +-
app/code/Magento/Payment/composer.json | 2 +-
app/code/Magento/Paypal/composer.json | 2 +-
app/code/Magento/Persistent/composer.json | 2 +-
app/code/Magento/ProductAlert/composer.json | 2 +-
.../Product/Gallery/RetrieveImage.php | 53 ++++-
.../Product/Gallery/RetrieveImageTest.php | 21 +-
app/code/Magento/ProductVideo/composer.json | 2 +-
app/code/Magento/ProductVideo/etc/di.xml | 1 +
app/code/Magento/ProductVideo/i18n/en_US.csv | 1 +
app/code/Magento/Quote/composer.json | 2 +-
app/code/Magento/Reports/composer.json | 2 +-
app/code/Magento/RequireJs/composer.json | 2 +-
app/code/Magento/Review/composer.json | 2 +-
app/code/Magento/Rss/composer.json | 2 +-
app/code/Magento/Rule/composer.json | 2 +-
app/code/Magento/Sales/composer.json | 2 +-
.../adminhtml/templates/order/view/info.phtml | 16 +-
app/code/Magento/SalesInventory/composer.json | 2 +-
app/code/Magento/SalesRule/composer.json | 2 +-
app/code/Magento/SalesSequence/composer.json | 2 +-
app/code/Magento/SampleData/composer.json | 2 +-
app/code/Magento/Search/composer.json | 2 +-
app/code/Magento/Security/composer.json | 2 +-
app/code/Magento/SendFriend/composer.json | 2 +-
app/code/Magento/Shipping/composer.json | 2 +-
app/code/Magento/Sitemap/composer.json | 2 +-
app/code/Magento/Store/composer.json | 2 +-
app/code/Magento/Swagger/composer.json | 2 +-
app/code/Magento/Swatches/composer.json | 2 +-
.../SwatchesLayeredNavigation/composer.json | 2 +-
app/code/Magento/Tax/composer.json | 2 +-
.../Magento/TaxImportExport/composer.json | 2 +-
app/code/Magento/Theme/composer.json | 2 +-
app/code/Magento/Translation/composer.json | 2 +-
app/code/Magento/Ui/composer.json | 2 +-
app/code/Magento/Ups/composer.json | 2 +-
app/code/Magento/UrlRewrite/composer.json | 2 +-
app/code/Magento/User/composer.json | 2 +-
app/code/Magento/Usps/composer.json | 2 +-
app/code/Magento/Variable/composer.json | 2 +-
app/code/Magento/Vault/composer.json | 2 +-
app/code/Magento/Version/composer.json | 2 +-
app/code/Magento/Webapi/composer.json | 2 +-
app/code/Magento/WebapiSecurity/composer.json | 2 +-
app/code/Magento/Weee/composer.json | 2 +-
app/code/Magento/Widget/composer.json | 2 +-
app/code/Magento/Wishlist/composer.json | 2 +-
.../adminhtml/Magento/backend/composer.json | 2 +-
.../frontend/Magento/blank/composer.json | 2 +-
.../frontend/Magento/luma/composer.json | 2 +-
composer.json | 2 +-
composer.lock | 86 +++----
.../composer.json | 4 +-
.../TestModuleJoinDirectives/composer.json | 2 +-
dev/tests/functional/composer.json | 2 +-
.../Magento/TestModuleSample/composer.json | 2 +-
.../Magento/Checkout/Controller/CartTest.php | 47 ++++
.../Customer/Controller/Section/LoadTest.php | 19 ++
.../Framework/DB/Adapter/Pdo/MysqlTest.php | 6 +-
.../root/app/code/Magento/A/composer.json | 2 +-
.../root/app/code/Magento/B/composer.json | 2 +-
.../adminhtml/magento_basic/composer.json | 2 +-
.../Framework/DB/Adapter/Pdo/Mysql.php | 10 +
.../Framework/Filter/Input/MaliciousCode.php | 2 +-
.../Test/Unit/Input/MaliciousCodeTest.php | 2 +
.../Magento/Framework/HTTP/Adapter/Curl.php | 54 +++--
.../HTTP/Test/Unit/Adapter/CurlTest.php | 9 +-
.../Framework/Session/SessionManager.php | 1 +
.../Framework/Validator/AllowedProtocols.php | 59 +++++
lib/internal/Magento/Framework/composer.json | 2 +-
.../Setup/Mvc/Bootstrap/InitParamListener.php | 16 +-
.../Mvc/Bootstrap/InitParamListenerTest.php | 205 +++++++++++++++--
160 files changed, 1530 insertions(+), 306 deletions(-)
create mode 100644 app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
create mode 100644 app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
create mode 100644 app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
create mode 100644 app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterCompositeTest.php
create mode 100644 app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterTest.php
create mode 100644 app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
create mode 100644 lib/internal/Magento/Framework/Validator/AllowedProtocols.php
diff --git a/app/bootstrap.php b/app/bootstrap.php
index ec60a1708da..c8e676cb69c 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -11,14 +11,14 @@ error_reporting(E_ALL);
#ini_set('display_errors', 1);
/* PHP version validation */
-if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
+if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50605 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
if (PHP_SAPI == 'cli') {
- echo 'Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
+ echo 'Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 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;">
- <p>Magento supports PHP 5.6, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
+ <p>Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 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>
@@ -35,6 +35,17 @@ $umaskFile = BP . '/magento_umask';
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
umask($mask);
+if (empty($_SERVER['ENABLE_IIS_REWRITES']) || ($_SERVER['ENABLE_IIS_REWRITES'] != 1)) {
+ /*
+ * Unset headers used by IIS URL rewrites.
+ */
+ unset($_SERVER['HTTP_X_REWRITE_URL']);
+ unset($_SERVER['HTTP_X_ORIGINAL_URL']);
+ unset($_SERVER['IIS_WasUrlRewritten']);
+ unset($_SERVER['UNENCODED_URL']);
+ unset($_SERVER['ORIG_PATH_INFO']);
+}
+
if (!empty($_SERVER['MAGE_PROFILER'])
&& isset($_SERVER['HTTP_ACCEPT'])
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index 527268df36b..09d8ce41bbb 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-media-storage": "100.2.*",
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index 65ea7524dff..2fc465fa3c3 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-advanced-pricing-import-export",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 0ca367d4854..af88e8376dc 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index 0c9e9641b60..b93cb6688f5 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-authorizenet",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-sales": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-quote": "100.2.*",
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 7d428636a1f..5cfe6955b46 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-directory": "100.2.*",
"magento/module-developer": "100.2.*",
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 21ed6f1780a..ee05d6726db 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-cron": "100.2.*",
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index 3b77e208837..91cacf6add2 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-braintree",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/magento-composer-installer": "*",
"magento/module-config": "100.2.*",
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index ab587044476..24756bdf950 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-tax": "100.2.*",
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index 3d7900d9828..2f5e3afdbff 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-bundle-import-export",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index cafccadb41a..c886e069b66 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-cache-invalidate",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-page-cache": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 9d0ce3db92a..45ecd32464e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-checkout": "100.2.*",
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 64157f6bc8a..8c77dd77f98 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-cms": "101.1.*",
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 7dbd7f4bc5e..8ed5f43692d 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-url-rewrite": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 254d8d2db4b..684f616ecd6 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 71eb5b49db1..004ab82a028 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-rule": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index cc51269e2d9..b930380f7bb 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-catalog-rule-configurable",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-configurable-product": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 49756420bd2..313cc99881a 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-search": "100.2.*",
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index 8fd54cbc8ee..a5f66cd09dd 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-import-export": "100.2.*",
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 330f4617628..198e54db32d 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-widget": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index fddfa63b598..bfbf0008bf5 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -84,6 +84,7 @@ class Add extends \Magento\Checkout\Controller\Cart
}
$params = $this->getRequest()->getParams();
+
try {
if (isset($params['qty'])) {
$filter = new \Zend_Filter_LocalizedToNormalized(
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 4ce23c9c7f7..236c716f572 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -91,6 +91,11 @@ class Cart extends DataObject implements CartInterface
*/
protected $productRepository;
+ /**
+ * @var \Magento\Checkout\Model\Cart\RequestInfoFilterInterface
+ */
+ private $requestInfoFilter;
+
/**
* @param \Magento\Framework\Event\ManagerInterface $eventManager
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -315,6 +320,7 @@ class Cart extends DataObject implements CartInterface
*
* @param \Magento\Framework\DataObject|int|array $requestInfo
* @return \Magento\Framework\DataObject
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
protected function _getProductRequest($requestInfo)
{
@@ -322,11 +328,14 @@ class Cart extends DataObject implements CartInterface
$request = $requestInfo;
} elseif (is_numeric($requestInfo)) {
$request = new \Magento\Framework\DataObject(['qty' => $requestInfo]);
- } else {
+ } elseif (is_array($requestInfo)) {
$request = new \Magento\Framework\DataObject($requestInfo);
+ } else {
+ throw new \Magento\Framework\Exception\LocalizedException(
+ __('We found an invalid request for adding product to quote.')
+ );
}
-
- !$request->hasFormKey() ?: $request->unsFormKey();
+ $this->getRequestInfoFilter()->filter($request);
return $request;
}
@@ -722,4 +731,19 @@ class Cart extends DataObject implements CartInterface
$this->_checkoutSession->setLastAddedProductId($productId);
return $result;
}
+
+ /**
+ * Getter for RequestInfoFilter
+ *
+ * @deprecated
+ * @return \Magento\Checkout\Model\Cart\RequestInfoFilterInterface
+ */
+ private function getRequestInfoFilter()
+ {
+ if ($this->requestInfoFilter === null) {
+ $this->requestInfoFilter = \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Checkout\Model\Cart\RequestInfoFilterInterface::class);
+ }
+ return $this->requestInfoFilter;
+ }
}
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
new file mode 100644
index 00000000000..10f3b81386b
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilter.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model\Cart;
+
+/**
+ * Class RequestInfoFilter used for filtering data from a request
+ */
+class RequestInfoFilter implements RequestInfoFilterInterface
+{
+ /**
+ * @var array $params
+ */
+ private $filterList;
+
+ /**
+ * @param array $filterList
+ */
+ public function __construct(
+ array $filterList = []
+ ) {
+ $this->filterList = $filterList;
+ }
+
+ /**
+ * Filters the data with values from filterList
+ *
+ * @param \Magento\Framework\DataObject $params
+ * @return $this
+ */
+ public function filter(\Magento\Framework\DataObject $params)
+ {
+ foreach ($this->filterList as $filterKey) {
+ /** @var string $filterKey */
+ if ($params->hasData($filterKey)) {
+ $params->unsetData($filterKey);
+ }
+ }
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
new file mode 100644
index 00000000000..2ef24c0a5f2
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model\Cart;
+
+/**
+ * Class RequestInfoFilterComposite
+ */
+class RequestInfoFilterComposite implements RequestInfoFilterInterface
+{
+ /**
+ * @var RequestInfoFilter[] $params
+ */
+ private $filters = [];
+
+ /**
+ * @param RequestInfoFilter[] $filters
+ */
+ public function __construct(
+ $filters = []
+ ) {
+ $this->filters = $filters;
+ }
+
+ /**
+ * Loops through all leafs of the composite and calls filter method
+ *
+ * @param \Magento\Framework\DataObject $params
+ * @return $this
+ */
+ public function filter(\Magento\Framework\DataObject $params)
+ {
+ foreach ($this->filters as $filter) {
+ $filter->filter($params);
+ }
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
new file mode 100644
index 00000000000..4bd268f6c89
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model\Cart;
+
+/**
+ * Interface RequestInfoFilterInterface used by composite and leafs to implement filtering
+ */
+interface RequestInfoFilterInterface
+{
+ /**
+ * Filters the data object by an array of parameters
+ *
+ * @param \Magento\Framework\DataObject $params
+ * @return RequestInfoFilterInterface
+ */
+ public function filter(\Magento\Framework\DataObject $params);
+}
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index b07e90384c1..f2ad294d06c 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -9,6 +9,9 @@ namespace Magento\Checkout\Model;
use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Framework\Exception\CouldNotSaveException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPaymentInformationManagementInterface
{
@@ -42,6 +45,11 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
*/
protected $cartRepository;
+ /**
+ * @var \Psr\Log\LoggerInterface
+ */
+ private $logger;
+
/**
* @param \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement
* @param \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement
@@ -79,7 +87,13 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
$this->savePaymentInformation($cartId, $email, $paymentMethod, $billingAddress);
try {
$orderId = $this->cartManagement->placeOrder($cartId);
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ throw new CouldNotSaveException(
+ __($e->getMessage()),
+ $e
+ );
} catch (\Exception $e) {
+ $this->getLogger()->critical($e);
throw new CouldNotSaveException(
__('An error occurred on the server. Please try to place the order again.'),
$e
@@ -117,4 +131,18 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
$quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
return $this->paymentInformationManagement->getPaymentInformation($quoteIdMask->getQuoteId());
}
+
+ /**
+ * Get logger instance
+ *
+ * @return \Psr\Log\LoggerInterface
+ * @deprecated
+ */
+ private function getLogger()
+ {
+ if (!$this->logger) {
+ $this->logger = \Magento\Framework\App\ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+ }
+ return $this->logger;
+ }
}
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 140917dcdfe..79e76feb436 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -7,6 +7,9 @@ namespace Magento\Checkout\Model;
use Magento\Framework\Exception\CouldNotSaveException;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInformationManagementInterface
{
/**
@@ -34,6 +37,11 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
*/
protected $cartTotalsRepository;
+ /**
+ * @var \Psr\Log\LoggerInterface
+ */
+ private $logger;
+
/**
* @param \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement
* @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
@@ -67,7 +75,13 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
$this->savePaymentInformation($cartId, $paymentMethod, $billingAddress);
try {
$orderId = $this->cartManagement->placeOrder($cartId);
+ } catch (\Magento\Framework\Exception\LocalizedException $e) {
+ throw new CouldNotSaveException(
+ __($e->getMessage()),
+ $e
+ );
} catch (\Exception $e) {
+ $this->getLogger()->critical($e);
throw new CouldNotSaveException(
__('An error occurred on the server. Please try to place the order again.'),
$e
@@ -102,4 +116,18 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
$paymentDetails->setTotals($this->cartTotalsRepository->get($cartId));
return $paymentDetails;
}
+
+ /**
+ * Get logger instance
+ *
+ * @return \Psr\Log\LoggerInterface
+ * @deprecated
+ */
+ private function getLogger()
+ {
+ if (!$this->logger) {
+ $this->logger = \Magento\Framework\App\ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+ }
+ return $this->logger;
+ }
}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterCompositeTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterCompositeTest.php
new file mode 100644
index 00000000000..6c758cf4661
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterCompositeTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Test\Unit\Model\Cart;
+
+/**
+ * Class RequestInfoFilterTest
+ */
+class RequestInfoFilterCompositeTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Checkout\Model\Cart\RequestInfoFilterComposite
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * Setup the test
+ */
+ protected function setUp()
+ {
+ $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $requestInfoFilterMock1 = $this->getMock(
+ \Magento\Checkout\Model\Cart\RequestInfoFilter::class,
+ ['filter'],
+ [],
+ '',
+ false
+ );
+ $requestInfoFilterMock2 = $this->getMock(
+ \Magento\Checkout\Model\Cart\RequestInfoFilter::class,
+ ['filter'],
+ [],
+ '',
+ false
+ );
+
+ $requestInfoFilterMock1->expects($this->atLeastOnce())
+ ->method('filter');
+ $requestInfoFilterMock2->expects($this->atLeastOnce())
+ ->method('filter');
+
+ $filterList = [ $requestInfoFilterMock1, $requestInfoFilterMock2];
+
+ $this->model = $this->objectManager->getObject(
+ \Magento\Checkout\Model\Cart\RequestInfoFilterComposite::class,
+ [
+ 'filters' => $filterList,
+ ]
+ );
+ }
+
+ /**
+ * Test Filter method
+ */
+ public function testFilter()
+ {
+ /** @var \Magento\Framework\DataObject $params */
+ $params = $this->objectManager->getObject(
+ \Magento\Framework\DataObject::class,
+ ['data' => ['abc' => 1, 'efg' => 1, 'xyz' => 1]]
+ );
+ $result = $this->model->filter($params);
+ $this->assertEquals($this->model, $result);
+ }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterTest.php
new file mode 100644
index 00000000000..cd6ca330da1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestInfoFilterTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Test\Unit\Model\Cart;
+
+/**
+ * Class RequestInfoFilterTest
+ */
+class RequestInfoFilterTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var \Magento\Checkout\Model\Cart\RequestInfoFilter
+ */
+ protected $model;
+
+ /**
+ * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+ */
+ protected $objectManager;
+
+ /**
+ * Setup the test
+ */
+ protected function setUp()
+ {
+ $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+ $this->model = $this->objectManager->getObject(
+ \Magento\Checkout\Model\Cart\RequestInfoFilter::class,
+ [
+ 'filterList' => ['efg', 'xyz'],
+ ]
+ );
+ }
+
+ /**
+ * Test Filter method
+ */
+ public function testFilter()
+ {
+ /** @var \Magento\Framework\DataObject $params */
+ $params = $this->objectManager->getObject(
+ \Magento\Framework\DataObject::class,
+ ['data' => ['abc' => 1, 'efg' => 1, 'xyz' => 1]]
+ );
+ $result = $this->model->filter($params);
+ $this->assertEquals($this->model, $result);
+ $this->assertEquals(['abc' => 1], $params->convertToArray());
+ }
+}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
index 199e6692e68..9984fe12d37 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/CartTest.php
@@ -29,7 +29,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
*/
protected $customerSessionMock;
- /** @var \Magento\CatalogInventory\Api\StockItem|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var \Magento\CatalogInventory\Api\Data\StockItemInterface|\PHPUnit_Framework_MockObject_MockObject */
protected $stockItemMock;
/**
@@ -57,16 +57,39 @@ class CartTest extends \PHPUnit_Framework_TestCase
*/
protected $stockState;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeManagerMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $storeMock;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $productRepository;
+
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $requestInfoFilterMock;
+
protected function setUp()
{
$this->checkoutSessionMock = $this->getMock(\Magento\Checkout\Model\Session::class, [], [], '', false);
$this->customerSessionMock = $this->getMock(\Magento\Customer\Model\Session::class, [], [], '', false);
$this->scopeConfigMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+ $this->quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
+ $this->eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
+ $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
+ $this->productRepository = $this->getMock(\Magento\Catalog\Api\ProductRepositoryInterface::class);
$this->stockRegistry = $this->getMockBuilder(\Magento\CatalogInventory\Model\StockRegistry::class)
->disableOriginalConstructor()
->setMethods(['getStockItem', '__wakeup'])
->getMock();
-
$this->stockItemMock = $this->getMock(
\Magento\CatalogInventory\Model\Stock\Item::class,
['getMinSaleQty', '__wakeup'],
@@ -74,7 +97,6 @@ class CartTest extends \PHPUnit_Framework_TestCase
'',
false
);
-
$this->stockState = $this->getMock(
\Magento\CatalogInventory\Model\StockState::class,
['suggestQty', '__wakeup'],
@@ -82,12 +104,22 @@ class CartTest extends \PHPUnit_Framework_TestCase
'',
false
);
+ $this->storeMock =
+ $this->getMock(\Magento\Store\Model\Store::class, ['getWebsiteId', 'getId', '__wakeup'], [], '', false);
+ $this->requestInfoFilterMock = $this->getMock(\Magento\Checkout\Model\Cart\RequestInfoFilterInterface::class);
$this->stockRegistry->expects($this->any())
->method('getStockItem')
->will($this->returnValue($this->stockItemMock));
- $this->quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
- $this->eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class);
+ $this->storeMock->expects($this->any())
+ ->method('getWebsiteId')
+ ->will($this->returnValue(10));
+ $this->storeMock->expects($this->any())
+ ->method('getId')
+ ->will($this->returnValue(10));
+ $this->storeManagerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
$this->objectManagerHelper = new ObjectManagerHelper($this);
$this->cart = $this->objectManagerHelper->getObject(
@@ -98,9 +130,14 @@ class CartTest extends \PHPUnit_Framework_TestCase
'stockRegistry' => $this->stockRegistry,
'stockState' => $this->stockState,
'customerSession' => $this->customerSessionMock,
- 'eventManager' => $this->eventManagerMock
+ 'eventManager' => $this->eventManagerMock,
+ 'storeManager' => $this->storeManagerMock,
+ 'productRepository' => $this->productRepository
]
);
+
+ $this->objectManagerHelper
+ ->setBackwardCompatibleProperty($this->cart, 'requestInfoFilter', $this->requestInfoFilterMock);
}
public function testSuggestItemsQty()
@@ -169,10 +206,17 @@ class CartTest extends \PHPUnit_Framework_TestCase
*/
public function prepareQuoteItemMock($itemId)
{
- $store = $this->getMock(\Magento\Store\Model\Store::class, ['getWebsiteId', '__wakeup'], [], '', false);
+ $store = $this->getMock(\Magento\Store\Model\Store::class, ['getId', '__wakeup'], [], '', false);
$store->expects($this->any())
->method('getWebsiteId')
->will($this->returnValue(10));
+ $store->expects($this->any())
+ ->method('getId')
+ ->will($this->returnValue(10));
+ $this->storeManagerMock->expects($this->any())
+ ->method('getStore')
+ ->will($this->returnValue($store));
+
switch ($itemId) {
case 2:
$product = $this->getMock(
@@ -255,4 +299,162 @@ class CartTest extends \PHPUnit_Framework_TestCase
['useQty' => false]
];
}
+
+ /**
+ * Test successful scenarios for AddProduct
+ *
+ * @param int|\Magento\Catalog\Model\Product $productInfo
+ * @param \Magento\Framework\DataObject|int|array $requestInfo
+ * @dataProvider addProductDataProvider
+ */
+ public function testAddProduct($productInfo, $requestInfo)
+ {
+ $product = $this->getMock(
+ \Magento\Catalog\Model\Product::class,
+ ['getStore', 'getWebsiteIds', 'getProductUrl', 'getId', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $product->expects($this->any())
+ ->method('getId')
+ ->will($this->returnValue(4));
+ $product->expects($this->once())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
+ $product->expects($this->any())
+ ->method('getWebsiteIds')
+ ->will($this->returnValue([10]));
+ $product->expects($this->any())
+ ->method('getProductUrl')
+ ->will($this->returnValue('url'));
+ $this->productRepository->expects($this->any())
+ ->method('getById')
+ ->will($this->returnValue($product));
+ $this->quoteMock->expects($this->once())
+ ->method('addProduct')
+ ->will($this->returnValue(1));
+ $this->checkoutSessionMock->expects($this->once())
+ ->method('getQuote')
+ ->will($this->returnValue($this->quoteMock));
+
+ $this->eventManagerMock->expects($this->at(0))->method('dispatch')->with(
+ 'checkout_cart_product_add_after',
+ ['quote_item' => 1, 'product' => $product]
+ );
+
+ if (!$productInfo) {
+ $productInfo = $product;
+ }
+ $result = $this->cart->addProduct($productInfo, $requestInfo);
+ $this->assertSame($this->cart, $result);
+ }
+
+ /**
+ * Test exception on adding product for AddProduct
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function testAddProductException()
+ {
+ $product = $this->getMock(
+ \Magento\Catalog\Model\Product::class,
+ ['getStore', 'getWebsiteIds', 'getProductUrl', 'getId', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $product->expects($this->any())
+ ->method('getId')
+ ->will($this->returnValue(4));
+ $product->expects($this->once())
+ ->method('getStore')
+ ->will($this->returnValue($this->storeMock));
+ $product->expects($this->any())
+ ->method('getWebsiteIds')
+ ->will($this->returnValue([10]));
+ $product->expects($this->any())
+ ->method('getProductUrl')
+ ->will($this->returnValue('url'));
+ $this->productRepository->expects($this->any())
+ ->method('getById')
+ ->will($this->returnValue($product));
+ $this->quoteMock->expects($this->once())
+ ->method('addProduct')
+ ->will($this->returnValue('error'));
+ $this->checkoutSessionMock->expects($this->once())
+ ->method('getQuote')
+ ->will($this->returnValue($this->quoteMock));
+
+ $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
+ 'checkout_cart_product_add_after',
+ ['quote_item' => 1, 'product' => $product]
+ );
+ $this->setExpectedException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->cart->addProduct(4, 4);
+ }
+
+ /**
+ * Test bad parameters on adding product for AddProduct
+ *
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function testAddProductExceptionBadParams()
+ {
+ $product = $this->getMock(
+ \Magento\Catalog\Model\Product::class,
+ ['getWebsiteIds', 'getId', '__wakeup'],
+ [],
+ '',
+ false
+ );
+ $product->expects($this->any())
+ ->method('getId')
+ ->will($this->returnValue(4));
+ $product->expects($this->any())
+ ->method('getWebsiteIds')
+ ->will($this->returnValue([10]));
+ $this->productRepository->expects($this->any())
+ ->method('getById')
+ ->will($this->returnValue($product));
+
+ $this->eventManagerMock->expects($this->never())->method('dispatch')->with(
+ 'checkout_cart_product_add_after',
+ ['quote_item' => 1, 'product' => $product]
+ );
+ $this->setExpectedException(\Magento\Framework\Exception\LocalizedException::class);
+ $this->cart->addProduct(4, 'bad');
+ }
+
+ /**
+ * Data provider for testAddProduct
+ *
+ * @return array
+ */
+ public function addProductDataProvider()
+ {
+ $obj = new ObjectManagerHelper($this) ;
+ $data = ['qty' => 5.5, 'sku' => 'prod'];
+
+ return [
+ 'prod_int_info_int' => [4, 4],
+ 'prod_int_info_array' => [ 4, $data],
+ 'prod_int_info_object' => [
+ 4,
+ $obj->getObject(
+ \Magento\Framework\DataObject::class,
+ ['data' => $data]
+ )
+ ],
+ 'prod_obj_info_int' => [null, 4],
+ 'prod_obj_info_array' => [ null, $data],
+ 'prod_obj_info_object' => [
+ null,
+ $obj->getObject(
+ \Magento\Framework\DataObject::class,
+ ['data' => $data]
+ )
+ ]
+ ];
+ }
}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index 093bbf4a5ac..76cbafb48eb 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -42,6 +42,11 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
*/
protected $model;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $loggerMock;
+
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -61,6 +66,7 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
'',
false
);
+ $this->loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
$this->model = $objectManager->getObject(
\Magento\Checkout\Model\GuestPaymentInformationManagement::class,
[
@@ -71,6 +77,7 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
]
);
+ $objectManager->setBackwardCompatibleProperty($this->model, 'logger', $this->loggerMock);
}
public function testSavePaymentInformationAndPlaceOrder()
@@ -112,7 +119,7 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
->method('assign')
->with($cartId, $billingAddressMock);
$this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
- $exception = new CouldNotSaveException(__('DB exception'));
+ $exception = new \Exception(__('DB exception'));
$this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
$this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
@@ -161,4 +168,29 @@ class GuestPaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
$billingAddressMock->expects($this->once())->method('setEmail')->with($email);
$this->assertTrue($this->model->savePaymentInformation($cartId, $email, $paymentMock));
}
+
+ /**
+ * @expectedExceptionMessage DB exception
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
+ {
+ $cartId = 100;
+ $email = 'email@magento.com';
+ $paymentMock = $this->getMock(\Magento\Quote\Api\Data\PaymentInterface::class);
+ $billingAddressMock = $this->getMock(\Magento\Quote\Api\Data\AddressInterface::class);
+
+ $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
+
+ $this->billingAddressManagementMock->expects($this->once())
+ ->method('assign')
+ ->with($cartId, $billingAddressMock);
+ $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+ $phrase = new \Magento\Framework\Phrase(__('DB exception'));
+ $exception = new \Magento\Framework\Exception\LocalizedException($phrase);
+ $this->loggerMock->expects($this->never())->method('critical');
+ $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
+
+ $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+ }
}
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
index 496054b2c7b..8da67a1fcb7 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
@@ -29,6 +29,11 @@ class PaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
*/
protected $model;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $loggerMock;
+
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -40,6 +45,8 @@ class PaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
);
$this->cartManagementMock = $this->getMock(\Magento\Quote\Api\CartManagementInterface::class);
+ $this->loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
+
$this->model = $objectManager->getObject(
\Magento\Checkout\Model\PaymentInformationManagement::class,
[
@@ -48,6 +55,7 @@ class PaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
'cartManagement' => $this->cartManagementMock
]
);
+ $objectManager->setBackwardCompatibleProperty($this->model, 'logger', $this->loggerMock);
}
public function testSavePaymentInformationAndPlaceOrder()
@@ -83,7 +91,8 @@ class PaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
->method('assign')
->with($cartId, $billingAddressMock);
$this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
- $exception = new CouldNotSaveException(__('DB exception'));
+ $exception = new \Exception(__('DB exception'));
+ $this->loggerMock->expects($this->once())->method('critical');
$this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
$this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
@@ -129,4 +138,26 @@ class PaymentInformationManagementTest extends \PHPUnit_Framework_TestCase
$this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock));
}
+
+ /**
+ * @expectedExceptionMessage DB exception
+ * @expectedException \Magento\Framework\Exception\CouldNotSaveException
+ */
+ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
+ {
+ $cartId = 100;
+ $paymentMock = $this->getMock(\Magento\Quote\Api\Data\PaymentInterface::class);
+ $billingAddressMock = $this->getMock(\Magento\Quote\Api\Data\AddressInterface::class);
+
+ $this->billingAddressManagementMock->expects($this->once())
+ ->method('assign')
+ ->with($cartId, $billingAddressMock);
+ $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+ $phrase = new \Magento\Framework\Phrase(__('DB exception'));
+ $exception = new \Magento\Framework\Exception\LocalizedException($phrase);
+ $this->loggerMock->expects($this->never())->method('critical');
+ $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
+
+ $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
+ }
}
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 5545e409b65..60919d9fa2c 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index c55598fdff5..a2243b33a04 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -26,4 +26,20 @@
<preference for="Magento\Checkout\Api\GuestTotalsInformationManagementInterface" type="Magento\Checkout\Model\GuestTotalsInformationManagement" />
<preference for="Magento\Checkout\Api\TotalsInformationManagementInterface" type="Magento\Checkout\Model\TotalsInformationManagement" />
<preference for="Magento\Checkout\Api\AgreementsValidatorInterface" type="Magento\Checkout\Model\AgreementsValidator" />
+ <preference for="Magento\Checkout\Model\Cart\RequestInfoFilterInterface"
+ type="Magento\Checkout\Model\Cart\RequestInfoFilterComposite"/>
+ <type name="Magento\Checkout\Model\Cart\RequestInfoFilter">
+ <arguments>
+ <argument name="filterList" xsi:type="array">
+ <item name="form_key" xsi:type="string">form_key</item>
+ </argument>
+ </arguments>
+ </type>
+ <type name="Magento\Checkout\Model\Cart\RequestInfoFilterComposite">
+ <arguments>
+ <argument name="filters" xsi:type="array">
+ <item name="filter" xsi:type="object">Magento\Checkout\Model\Cart\RequestInfoFilter</item>
+ </argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index bccf81bcb6e..6fb9058c3b7 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -72,4 +72,12 @@
</argument>
</arguments>
</type>
+ <type name="Magento\Checkout\Model\Cart\RequestInfoFilter">
+ <arguments>
+ <argument name="filterList" xsi:type="array">
+ <item name="form_key" xsi:type="string">form_key</item>
+ <item name="custom_price" xsi:type="string">custom_price</item>
+ </argument>
+ </arguments>
+ </type>
</config>
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index afb706a39a2..56a2b567745 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-checkout": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
new file mode 100644
index 00000000000..4e1de289e5e
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Cms\Test\Unit\Ui\Component\Listing\Column;
+
+use Magento\Cms\Ui\Component\Listing\Column\BlockActions;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\Processor;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * BlockActionsTest contains unit tests for \Magento\Cms\Ui\Component\Listing\Column\BlockActions class
+ */
+class BlockActionsTest extends \PHPUnit_Framework_TestCase
+{
+ /**
+ * @var BlockActions
+ */
+ private $blockActions;
+
+ /**
+ * @var Escaper|MockObject
+ */
+ private $escaper;
+
+ /**
+ * @var UrlInterface|MockObject
+ */
+ private $urlBuilder;
+
+ protected function setUp()
+ {
+ $objectManager = new ObjectManager($this);
+
+ $context = $this->getMock(ContextInterface::class);
+
+ $processor = $this->getMockBuilder(Processor::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $context->expects(static::once())
+ ->method('getProcessor')
+ ->willReturn($processor);
+
+ $this->urlBuilder = $this->getMock(UrlInterface::class);
+
+ $this->escaper = $this->getMockBuilder(Escaper::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['escapeHtml'])
+ ->getMock();
+
+ $this->blockActions = $objectManager->getObject(BlockActions::class, [
+ 'context' => $context,
+ 'urlBuilder' => $this->urlBuilder
+ ]);
+
+ $objectManager->setBackwardCompatibleProperty($this->blockActions, 'escaper', $this->escaper);
+ }
+
+ /**
+ * @covers \Magento\Cms\Ui\Component\Listing\Column\BlockActions::prepareDataSource
+ */
+ public function testPrepareDataSource()
+ {
+ $blockId = 1;
+ $title = 'block title';
+ $items = [
+ 'data' => [
+ 'items' => [
+ [
+ 'block_id' => $blockId,
+ 'title' => $title
+ ]
+ ]
+ ]
+ ];
+ $name = 'item_name';
+ $expectedItems = [
+ [
+ 'block_id' => $blockId,
+ 'title' => $title,
+ $name => [
+ 'edit' => [
+ 'href' => 'test/url/edit',
+ 'label' => __('Edit'),
+ ],
+ 'delete' => [
+ 'href' => 'test/url/delete',
+ 'label' => __('Delete'),
+ 'confirm' => [
+ 'title' => __('Delete %1', $title),
+ 'message' => __('Are you sure you wan\'t to delete a %1 record?', $title)
+ ],
+ ]
+ ],
+ ]
+ ];
+
+ $this->escaper->expects(static::once())
+ ->method('escapeHtml')
+ ->with($title)
+ ->willReturn($title);
+
+ $this->urlBuilder->expects(static::exactly(2))
+ ->method('getUrl')
+ ->willReturnMap(
+ [
+ [
+ BlockActions::URL_PATH_EDIT,
+ [
+ 'block_id' => $blockId
+ ],
+ 'test/url/edit',
+ ],
+ [
+ BlockActions::URL_PATH_DELETE,
+ [
+ 'block_id' => $blockId
+ ],
+ 'test/url/delete',
+ ],
+ ]
+ );
+
+ $this->blockActions->setData('name', $name);
+
+ $actual = $this->blockActions->prepareDataSource($items);
+ static::assertEquals($expectedItems, $actual['data']['items']);
+ }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
index 4b6ce1ae2ff..731c08fbc64 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
@@ -6,6 +6,7 @@
namespace Magento\Cms\Test\Unit\Ui\Component\Listing\Column;
use Magento\Cms\Ui\Component\Listing\Column\PageActions;
+use Magento\Framework\Escaper;
class PageActionsTest extends \PHPUnit_Framework_TestCase
{
@@ -34,12 +35,20 @@ class PageActionsTest extends \PHPUnit_Framework_TestCase
]
);
+ $escaper = $this->getMockBuilder(Escaper::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['escapeHtml'])
+ ->getMock();
+ $objectManager->setBackwardCompatibleProperty($model, 'escaper', $escaper);
+
// Define test input and expectations
+ $title = 'page title';
$items = [
'data' => [
'items' => [
[
- 'page_id' => $pageId
+ 'page_id' => $pageId,
+ 'title' => $title
]
]
]
@@ -48,6 +57,7 @@ class PageActionsTest extends \PHPUnit_Framework_TestCase
$expectedItems = [
[
'page_id' => $pageId,
+ 'title' => $title,
$name => [
'edit' => [
'href' => 'test/url/edit',
@@ -57,14 +67,19 @@ class PageActionsTest extends \PHPUnit_Framework_TestCase
'href' => 'test/url/delete',
'label' => __('Delete'),
'confirm' => [
- 'title' => __('Delete ${ $.$data.title }'),
- 'message' => __('Are you sure you wan\'t to delete a ${ $.$data.title } record?')
+ 'title' => __('Delete %1', $title),
+ 'message' => __('Are you sure you wan\'t to delete a %1 record?', $title)
],
]
],
]
];
+ $escaper->expects(static::once())
+ ->method('escapeHtml')
+ ->with($title)
+ ->willReturn($title);
+
// Configure mocks and object data
$urlBuilderMock->expects($this->any())
->method('getUrl')
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
index e71352c4653..f0a1fe7981f 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -9,6 +9,8 @@ use Magento\Framework\UrlInterface;
use Magento\Framework\View\Element\UiComponent\ContextInterface;
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
/**
* Class BlockActions
@@ -27,6 +29,11 @@ class BlockActions extends Column
*/
protected $urlBuilder;
+ /**
+ * @var Escaper
+ */
+ private $escaper;
+
/**
* Constructor
*
@@ -47,10 +54,6 @@ class BlockActions extends Column
parent::__construct($context, $uiComponentFactory, $components, $data);
}
- /**
- * @param array $items
- * @return array
- */
/**
* Prepare Data Source
*
@@ -62,6 +65,7 @@ class BlockActions extends Column
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
if (isset($item['block_id'])) {
+ $title = $this->getEscaper()->escapeHtml($item['title']);
$item[$this->getData('name')] = [
'edit' => [
'href' => $this->urlBuilder->getUrl(
@@ -81,8 +85,8 @@ class BlockActions extends Column
),
'label' => __('Delete'),
'confirm' => [
- 'title' => __('Delete "${ $.$data.title }"'),
- 'message' => __('Are you sure you wan\'t to delete a "${ $.$data.title }" record?')
+ 'title' => __('Delete %1', $title),
+ 'message' => __('Are you sure you wan\'t to delete a %1 record?', $title)
]
]
];
@@ -92,4 +96,17 @@ class BlockActions extends Column
return $dataSource;
}
+
+ /**
+ * Get instance of escaper
+ * @return Escaper
+ * @deprecated
+ */
+ private function getEscaper()
+ {
+ if (!$this->escaper) {
+ $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
+ }
+ return $this->escaper;
+ }
}
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
index fe85fd0ef31..f23afbffa79 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/PageActions.php
@@ -5,11 +5,13 @@
*/
namespace Magento\Cms\Ui\Component\Listing\Column;
+use Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action\UrlBuilder;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
+use Magento\Framework\UrlInterface;
use Magento\Framework\View\Element\UiComponent\ContextInterface;
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Cms\Block\Adminhtml\Page\Grid\Renderer\Action\UrlBuilder;
-use Magento\Framework\UrlInterface;
/**
* Class PageActions
@@ -31,6 +33,11 @@ class PageActions extends Column
*/
private $editUrl;
+ /**
+ * @var Escaper
+ */
+ private $escaper;
+
/**
* @param ContextInterface $context
* @param UiComponentFactory $uiComponentFactory
@@ -71,12 +78,13 @@ class PageActions extends Column
'href' => $this->urlBuilder->getUrl($this->editUrl, ['page_id' => $item['page_id']]),
'label' => __('Edit')
];
+ $title = $this->getEscaper()->escapeHtml($item['title']);
$item[$name]['delete'] = [
'href' => $this->urlBuilder->getUrl(self::CMS_URL_PATH_DELETE, ['page_id' => $item['page_id']]),
'label' => __('Delete'),
'confirm' => [
- 'title' => __('Delete ${ $.$data.title }'),
- 'message' => __('Are you sure you wan\'t to delete a ${ $.$data.title } record?')
+ 'title' => __('Delete %1', $title),
+ 'message' => __('Are you sure you wan\'t to delete a %1 record?', $title)
]
];
}
@@ -95,4 +103,17 @@ class PageActions extends Column
return $dataSource;
}
+
+ /**
+ * Get instance of escaper
+ * @return Escaper
+ * @deprecated
+ */
+ private function getEscaper()
+ {
+ if (!$this->escaper) {
+ $this->escaper = ObjectManager::getInstance()->get(Escaper::class);
+ }
+ return $this->escaper;
+ }
}
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 66f6da042e6..7f2ed4d7a7d 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-theme": "100.2.*",
"magento/module-widget": "100.2.*",
diff --git a/app/code/Magento/Cms/i18n/en_US.csv b/app/code/Magento/Cms/i18n/en_US.csv
index 6f3a2955a5c..9a9f6ac4c68 100644
--- a/app/code/Magento/Cms/i18n/en_US.csv
+++ b/app/code/Magento/Cms/i18n/en_US.csv
@@ -84,10 +84,8 @@ Exception,Exception
"All Store Views","All Store Views"
Edit,Edit
Delete,Delete
-"Delete ${ $.$data.title }","Delete ${ $.$data.title }"
-"Are you sure you wan\'t to delete a ${ $.$data.title } record?","Are you sure you wan\'t to delete a ${ $.$data.title } record?"
-"Delete ""${ $.$data.title }""","Delete ""${ $.$data.title }"""
-"Are you sure you wan\'t to delete a ""${ $.$data.title }"" record?","Are you sure you wan\'t to delete a ""${ $.$data.title }"" record?"
+"Delete %1","Delete %1"
+"Are you sure you wan\'t to delete a %1 record?","Are you sure you wan\'t to delete a %1 record?"
View,View
px.,px.
"No files found","No files found"
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 1ae1efd9350..1d2e70c74eb 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-cms": "101.1.*",
"magento/module-url-rewrite": "100.2.*",
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index bdd1a9c14ae..b14dd825b0d 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-config",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-cron": "100.2.*",
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 6c249134d28..d292e731984 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-import-export": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 8dda841250f..755b94a600a 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-inventory": "100.2.*",
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index b541f1e7a0e..377e46256c0 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 52229757233..96a050f2ad2 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-cookie",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index b1155c028f9..75a7ce27a2a 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 2cdfedadf7a..29f0bd7435e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-page-cache": "100.2.*",
diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php
index 19b361b2c83..c1ec593e4a7 100644
--- a/app/code/Magento/Customer/Controller/Section/Load.php
+++ b/app/code/Magento/Customer/Controller/Section/Load.php
@@ -5,10 +5,10 @@
*/
namespace Magento\Customer\Controller\Section;
+use Magento\Customer\CustomerData\Section\Identifier;
use Magento\Customer\CustomerData\SectionPoolInterface;
use Magento\Framework\App\Action\Context;
use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\Exception\LocalizedException;
/**
* Customer section controller
@@ -22,6 +22,7 @@ class Load extends \Magento\Framework\App\Action\Action
/**
* @var Identifier
+ * @deprecated
*/
protected $sectionIdentifier;
@@ -30,26 +31,34 @@ class Load extends \Magento\Framework\App\Action\Action
*/
protected $sectionPool;
+ /**
+ * @var \Magento\Framework\Escaper
+ */
+ private $escaper;
+
/**
* @param Context $context
* @param JsonFactory $resultJsonFactory
- * @param \Magento\Customer\CustomerData\Section\Identifier $sectionIdentifier
+ * @param Identifier $sectionIdentifier
* @param SectionPoolInterface $sectionPool
+ * @param Escaper $escaper
*/
public function __construct(
Context $context,
JsonFactory $resultJsonFactory,
- \Magento\Customer\CustomerData\Section\Identifier $sectionIdentifier,
- SectionPoolInterface $sectionPool
+ Identifier $sectionIdentifier,
+ SectionPoolInterface $sectionPool,
+ \Magento\Framework\Escaper $escaper = null
) {
parent::__construct($context);
$this->resultJsonFactory = $resultJsonFactory;
$this->sectionIdentifier = $sectionIdentifier;
$this->sectionPool = $sectionPool;
+ $this->escaper = $escaper ?: $this->_objectManager->get(\Magento\Framework\Escaper::class);
}
/**
- * @return \Magento\Framework\Controller\Result\Json|\Magento\Framework\Controller\Result\Redirect
+ * @return \Magento\Framework\Controller\Result\Json
*/
public function execute()
{
@@ -60,7 +69,7 @@ class Load extends \Magento\Framework\App\Action\Action
$sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null;
$updateSectionId = $this->getRequest()->getParam('update_section_id');
- if ('false' == $updateSectionId) {
+ if ('false' === $updateSectionId) {
$updateSectionId = false;
}
$response = $this->sectionPool->getSectionsData($sectionNames, (bool)$updateSectionId);
@@ -70,7 +79,7 @@ class Load extends \Magento\Framework\App\Action\Action
\Zend\Http\AbstractMessage::VERSION_11,
'Bad Request'
);
- $response = ['message' => $e->getMessage()];
+ $response = ['message' => $this->escaper->escapeHtml($e->getMessage())];
}
return $resultJson->setData($response);
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 74f0ebc2b5e..53e1a270fb3 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-directory": "100.2.*",
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 533f40c7688..cd02f6dbfb3 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index 856e0d8b3e5..ed0b8520ca6 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-deploy",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-require-js": "100.2.*",
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index 23f6d20c2aa..73fd1c17750 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-developer",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-config": "100.2.*"
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index e88cd535952..15ca7882331 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-shipping": "100.2.*",
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index 9b3b253c26a..82d8bca34da 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 8d8814740cc..ea8eef6436e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index c99a0d6d05b..4f95711b279 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-downloadable-import-export",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
index bcad34654b9..c18af6380a3 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/AttributeTest.php
@@ -29,7 +29,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
{
$this->contextMock = $this->getMock(
\Magento\Framework\Model\Context::class,
- ['getCacheManager', 'getEventDispatcher', 'getLogger', 'getAppState', 'getActionValidator'],
+ [],
[],
'',
false
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 16e62a6434a..9863a89fff5 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 33d04b92127..648c984de0b 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-theme": "100.2.*",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 6d7ff555873..11b1c034a76 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-encryption-key",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*"
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index d27d5c1c60d..8d487485c0d 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-shipping": "100.2.*",
"magento/module-directory": "100.2.*",
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 04c620dc36d..067bf16017b 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-checkout": "100.2.*",
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index ad3df5c0b8b..cacbbe2088c 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/framework": "100.2.*"
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 4cccc7bd0cb..8653e93d7a9 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/framework": "100.2.*",
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 20a48fc7806..8c61e9f068e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-google-analytics": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index b036a8d5d52..50c061e5b56 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 69aed214284..0f207eb4147 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-catalog-inventory": "100.2.*",
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 35a088cbd9c..5e403d21806 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index cbaab12f6ee..e80d8a9f7bc 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 028e5647226..f76d60c957c 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index 99299c3e4a3..d1d82781bb5 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/framework": "100.2.*"
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 2916ff94544..ed79a80bc0c 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-marketplace",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/module-backend": "100.2.*"
},
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index fa7858d5b0a..141e1c19c53 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-media-storage",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-config": "100.2.*",
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index b86374e6be2..422aac99869 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-downloadable": "100.2.*",
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 8d9ac91cd05..970c7ea0569 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-sales": "100.2.*",
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index 9faa17d454e..097de6bea92 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-new-relic-reporting",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 06a278aef6d..ab5cdd1510a 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-widget": "100.2.*",
diff --git a/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php b/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
index 84b6e554d4c..8616c186555 100644
--- a/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
+++ b/app/code/Magento/OfflinePayments/Block/Info/Checkmo.php
@@ -49,20 +49,13 @@ class Checkmo extends \Magento\Payment\Block\Info
}
/**
- * Enter description here...
- *
+ * @deprecated
* @return $this
*/
protected function _convertAdditionalData()
{
- $details = @unserialize($this->getInfo()->getAdditionalData());
- if (is_array($details)) {
- $this->_payableTo = isset($details['payable_to']) ? (string)$details['payable_to'] : '';
- $this->_mailingAddress = isset($details['mailing_address']) ? (string)$details['mailing_address'] : '';
- } else {
- $this->_payableTo = '';
- $this->_mailingAddress = '';
- }
+ $this->_payableTo = $this->getInfo()->getAdditionalInformation('payable_to');
+ $this->_mailingAddress = $this->getInfo()->getAdditionalInformation('mailing_address');
return $this;
}
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php
index 848cfbae52b..27209fc8d35 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Block/Info/CheckmoTest.php
@@ -5,81 +5,118 @@
*/
namespace Magento\OfflinePayments\Test\Unit\Block\Info;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\OfflinePayments\Block\Info\Checkmo;
+use Magento\Payment\Model\Info;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * CheckmoTest contains list of test for block methods testing
+ */
class CheckmoTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var \Magento\OfflinePayments\Block\Info\Checkmo
+ * @var Info|MockObject
+ */
+ private $info;
+
+ /**
+ * @var Checkmo
*/
- protected $_model;
+ private $block;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- $context = $this->getMock(\Magento\Framework\View\Element\Template\Context::class, [], [], '', false);
- $this->_model = new \Magento\OfflinePayments\Block\Info\Checkmo($context);
+ $context = $this->getMockBuilder(Context::class)
+ ->disableOriginalConstructor()
+ ->setMethods([])
+ ->getMock();
+
+ $this->info = $this->getMockBuilder(Info::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['getAdditionalInformation'])
+ ->getMock();
+
+ $this->block = new Checkmo($context);
}
/**
+ * @covers \Magento\OfflinePayments\Block\Info\Checkmo::getPayableTo
+ * @param array $details
+ * @param string|null $expected
* @dataProvider getPayableToDataProvider
*/
public function testGetPayableTo($details, $expected)
{
- $info = $this->getMock(\Magento\Payment\Model\Info::class, ['getAdditionalData'], [], '', false);
- $info->expects($this->once())
- ->method('getAdditionalData')
- ->willReturn(serialize($details));
- $this->_model->setData('info', $info);
+ $this->info->expects(static::at(0))
+ ->method('getAdditionalInformation')
+ ->with('payable_to')
+ ->willReturn($details);
+ $this->block->setData('info', $this->info);
- $this->assertEquals($expected, $this->_model->getPayableTo());
+ static::assertEquals($expected, $this->block->getPayableTo());
}
/**
+ * Get list of variations for payable configuration option testing
* @return array
*/
public function getPayableToDataProvider()
{
return [
- [['payable_to' => 'payable'], 'payable'],
- ['', '']
+ ['payable_to' => 'payable', 'payable'],
+ ['', null]
];
}
/**
+ * @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
+ * @param array $details
+ * @param string|null $expected
* @dataProvider getMailingAddressDataProvider
*/
public function testGetMailingAddress($details, $expected)
{
- $info = $this->getMock(\Magento\Payment\Model\Info::class, ['getAdditionalData'], [], '', false);
- $info->expects($this->once())
- ->method('getAdditionalData')
- ->willReturn(serialize($details));
- $this->_model->setData('info', $info);
+ $this->info->expects(static::at(1))
+ ->method('getAdditionalInformation')
+ ->with('mailing_address')
+ ->willReturn($details);
+ $this->block->setData('info', $this->info);
- $this->assertEquals($expected, $this->_model->getMailingAddress());
+ static::assertEquals($expected, $this->block->getMailingAddress());
}
/**
+ * Get list of variations for mailing address testing
* @return array
*/
public function getMailingAddressDataProvider()
{
return [
- [['mailing_address' => 'blah@blah.com'], 'blah@blah.com'],
- ['', '']
+ ['mailing_address' => 'blah@blah.com', 'blah@blah.com'],
+ ['mailing_address' => '', null]
];
}
+ /**
+ * @covers \Magento\OfflinePayments\Block\Info\Checkmo::getMailingAddress
+ */
public function testConvertAdditionalDataIsNeverCalled()
{
- $info = $this->getMock(\Magento\Payment\Model\Info::class, ['getAdditionalData'], [], '', false);
- $info->expects($this->once())
- ->method('getAdditionalData')
- ->willReturn(serialize(['mailing_address' => 'blah@blah.com']));
- $this->_model->setData('info', $info);
+ $mailingAddress = 'blah@blah.com';
+ $this->info->expects(static::at(1))
+ ->method('getAdditionalInformation')
+ ->with('mailing_address')
+ ->willReturn($mailingAddress);
+ $this->block->setData('info', $this->info);
// First we set the property $this->_mailingAddress
- $this->_model->getMailingAddress();
+ $this->block->getMailingAddress();
// And now we get already setted property $this->_mailingAddress
- $this->assertEquals('blah@blah.com', $this->_model->getMailingAddress());
+ static::assertEquals($mailingAddress, $this->block->getMailingAddress());
}
}
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 52deb08ba3d..cf728aaa1c5 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-checkout": "100.2.*",
"magento/module-payment": "100.2.*",
"magento/framework": "100.2.*"
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
index d5bff77e002..8c5cfd50cc1 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -10,7 +10,7 @@
*/
?>
<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
-<?php if ($block->getInfo()->getAdditionalData()): ?>
+<?php if ($block->getInfo()->getAdditionalInformation()): ?>
<?php if ($block->getPayableTo()): ?>
<br /><?php echo $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
<?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
index 6195cdbd776..5587ac239d3 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
@@ -11,7 +11,7 @@
?>
<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
{{pdf_row_separator}}
-<?php if ($block->getInfo()->getAdditionalData()): ?>
+<?php if ($block->getInfo()->getAdditionalInformation()): ?>
{{pdf_row_separator}}
<?php if ($block->getPayableTo()): ?>
<?php echo $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
index f0dbff1add3..3c0b6bb2308 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
@@ -11,7 +11,7 @@
?>
<dl class="payment-method checkmemo">
<dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
- <?php if ($block->getInfo()->getAdditionalData()): ?>
+ <?php if ($block->getInfo()->getAdditionalInformation()): ?>
<?php if ($block->getPayableTo()): ?>
<dd class="content">
<strong><?php echo $block->escapeHtml(__('Make Check payable to')) ?></strong>
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 3c959b4dec7..b429376c6cd 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 5c29e4fc3c9..f18eb7bbe94 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 35ff326d916..c8d7254ce9e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-sales": "100.2.*",
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index bddc5d91a94..7503db18f00 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-paypal",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-checkout": "100.2.*",
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 25cc9d76acd..61f77a104c0 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index a43a5220974..9c63c6958a4 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
index f0edccbaf81..7a087f76987 100644
--- a/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
+++ b/app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php
@@ -6,6 +6,7 @@
namespace Magento\ProductVideo\Controller\Adminhtml\Product\Gallery;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\File\Uploader;
/**
@@ -43,6 +44,13 @@ class RetrieveImage extends \Magento\Backend\App\Action
*/
protected $fileUtility;
+ /**
+ * URI validator
+ *
+ * @var \Magento\Framework\Validator\ValidatorInterface
+ */
+ private $protocolValidator;
+
/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
@@ -51,6 +59,7 @@ class RetrieveImage extends \Magento\Backend\App\Action
* @param \Magento\Framework\Image\AdapterFactory $imageAdapterFactory
* @param \Magento\Framework\HTTP\Adapter\Curl $curl
* @param \Magento\MediaStorage\Model\ResourceModel\File\Storage\File $fileUtility
+ * @param \Magento\Framework\Validator\ValidatorInterface $protocolValidator
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
@@ -59,7 +68,8 @@ class RetrieveImage extends \Magento\Backend\App\Action
\Magento\Framework\Filesystem $fileSystem,
\Magento\Framework\Image\AdapterFactory $imageAdapterFactory,
\Magento\Framework\HTTP\Adapter\Curl $curl,
- \Magento\MediaStorage\Model\ResourceModel\File\Storage\File $fileUtility
+ \Magento\MediaStorage\Model\ResourceModel\File\Storage\File $fileUtility,
+ \Magento\Framework\Validator\ValidatorInterface $protocolValidator = null
) {
parent::__construct($context);
$this->resultRawFactory = $resultRawFactory;
@@ -68,6 +78,10 @@ class RetrieveImage extends \Magento\Backend\App\Action
$this->imageAdapter = $imageAdapterFactory->create();
$this->curl = $curl;
$this->fileUtility = $fileUtility;
+
+ $this->protocolValidator = $protocolValidator ?:
+ \Magento\Framework\App\ObjectManager::getInstance()
+ ->get(\Magento\Framework\Validator\ValidatorInterface::class);
}
/**
@@ -78,15 +92,15 @@ class RetrieveImage extends \Magento\Backend\App\Action
$baseTmpMediaPath = $this->mediaConfig->getBaseTmpMediaPath();
try {
$remoteFileUrl = $this->getRequest()->getParam('remote_image');
- $originalFileName = basename($remoteFileUrl);
- $localFileName = Uploader::getCorrectFileName($originalFileName);
+ $this->validateRemoteFile($remoteFileUrl);
+ $localFileName = Uploader::getCorrectFileName(basename($remoteFileUrl));
$localTmpFileName = Uploader::getDispretionPath($localFileName) . DIRECTORY_SEPARATOR . $localFileName;
- $localFileMediaPath = $baseTmpMediaPath . ($localTmpFileName);
- $localUniqueFileMediaPath = $this->appendNewFileName($localFileMediaPath);
- $this->retrieveRemoteImage($remoteFileUrl, $localUniqueFileMediaPath);
- $localFileFullPath = $this->appendAbsoluteFileSystemPath($localUniqueFileMediaPath);
+ $localFilePath = $baseTmpMediaPath . ($localTmpFileName);
+ $localUniqFilePath = $this->appendNewFileName($localFilePath);
+ $this->retrieveRemoteImage($remoteFileUrl, $localUniqFilePath);
+ $localFileFullPath = $this->appendAbsoluteFileSystemPath($localUniqFilePath);
$this->imageAdapter->validateUploadFile($localFileFullPath);
- $result = $this->appendResultSaveRemoteImage($localUniqueFileMediaPath);
+ $result = $this->appendResultSaveRemoteImage($localUniqFilePath);
} catch (\Exception $e) {
$result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
}
@@ -98,6 +112,25 @@ class RetrieveImage extends \Magento\Backend\App\Action
return $response;
}
+ /**
+ * Validate remote file
+ *
+ * @param string $remoteFileUrl
+ * @throws LocalizedException
+ *
+ * @return $this
+ */
+ private function validateRemoteFile($remoteFileUrl)
+ {
+ if (!$this->protocolValidator->isValid($remoteFileUrl)) {
+ throw new LocalizedException(
+ __("Protocol isn't allowed")
+ );
+ }
+
+ return $this;
+ }
+
/**
* @param string $fileName
* @return mixed
@@ -116,6 +149,8 @@ class RetrieveImage extends \Magento\Backend\App\Action
}
/**
+ * Trying to get remote image to save it locally
+ *
* @param string $fileUrl
* @param string $localFilePath
* @return void
@@ -127,7 +162,7 @@ class RetrieveImage extends \Magento\Backend\App\Action
$this->curl->write('GET', $fileUrl);
$image = $this->curl->read();
if (empty($image)) {
- throw new \Magento\Framework\Exception\LocalizedException(
+ throw new LocalizedException(
__('Could not get preview image information. Please check your connection and try again.')
);
}
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
index 79d83f38421..64149d529e5 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
@@ -73,17 +73,11 @@ class RetrieveImageTest extends \PHPUnit_Framework_TestCase
*/
protected function setUp()
{
+ $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
$this->contextMock = $this->getMock(\Magento\Backend\App\Action\Context::class, [], [], '', false);
$this->rawFactoryMock =
$this->getMock(\Magento\Framework\Controller\Result\RawFactory::class, ['create'], [], '', false);
- $response =
- $this->getMock(
- \Magento\Framework\Controller\Result\Raw::class,
- [],
- [],
- '',
- false
- );
+ $response = new \Magento\Framework\DataObject();
$this->rawFactoryMock->expects($this->once())->method('create')->willReturn($response);
$this->configMock = $this->getMock(\Magento\Catalog\Model\Product\Media\Config::class, [], [], '', false);
$this->filesystemMock = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
@@ -101,11 +95,15 @@ class RetrieveImageTest extends \PHPUnit_Framework_TestCase
$this->adapterFactoryMock->expects($this->once())->method('create')->willReturn($this->abstractAdapter);
$this->curlMock = $this->getMock(\Magento\Framework\HTTP\Adapter\Curl::class, [], [], '', false);
$this->storageFileMock =
- $this->getMock(\Magento\MediaStorage\Model\ResourceModel\File\Storage\File::class, [], [], '', false);
+ $this->getMock(\Magento\MediaStorage\Model\ResourceModel\File\Storage\File::class, [], [], '', false);
$this->request = $this->getMock(\Magento\Framework\App\RequestInterface::class);
$this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
-
- $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $managerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['get'])
+ ->getMockForAbstractClass();
+ $this->contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
+ $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($managerMock);
$this->image = $objectManager->getObject(
\Magento\ProductVideo\Controller\Adminhtml\Product\Gallery\RetrieveImage::class,
@@ -117,6 +115,7 @@ class RetrieveImageTest extends \PHPUnit_Framework_TestCase
'imageAdapterFactory' => $this->adapterFactoryMock,
'curl' => $this->curlMock,
'fileUtility' => $this->storageFileMock,
+ 'protocolValidator' => new \Magento\Framework\Validator\AllowedProtocols(),
]
);
}
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 362fd006d26..08d21e4c2ab 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-product-video",
"description": "Add Video to Products",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-backend": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/ProductVideo/etc/di.xml b/app/code/Magento/ProductVideo/etc/di.xml
index 09c15d8fcce..7242a9d48ce 100644
--- a/app/code/Magento/ProductVideo/etc/di.xml
+++ b/app/code/Magento/ProductVideo/etc/di.xml
@@ -7,6 +7,7 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
<preference for="Magento\Framework\Api\Data\VideoContentInterface" type="Magento\ProductVideo\Model\Product\Attribute\Media\VideoEntry" />
+ <preference for="Magento\Framework\Validator\ValidatorInterface" type="Magento\Framework\Validator\AllowedProtocols" />
<type name="Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool">
<arguments>
<argument name="mediaGalleryEntryConvertersCollection" xsi:type="array">
diff --git a/app/code/Magento/ProductVideo/i18n/en_US.csv b/app/code/Magento/ProductVideo/i18n/en_US.csv
index 4cfabe1592d..64a08075c19 100644
--- a/app/code/Magento/ProductVideo/i18n/en_US.csv
+++ b/app/code/Magento/ProductVideo/i18n/en_US.csv
@@ -40,3 +40,4 @@ Delete,Delete
"Show related video","Show related video"
"Auto restart video","Auto restart video"
"Images And Videos","Images And Videos"
+"Protocol isn't allowed", "Protocol isn't allowed"
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 79c3a1aaa9d..76063b177d4 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-quote",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 0bb989cb54a..9c76abd07b9 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 8c9fed33ab7..68428caa867 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 09f5529feab..3ec82943476 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index d35f0ee6ebe..fedd0ffeaac 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*",
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 95b8e6ffec2..31ee3254d99 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 09d1a9d6b7d..6b5638455a1 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
index 775c7214c2f..20cfcdeadf2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -38,10 +38,10 @@ $orderStoreDate = $block->formatDate(
<div class="admin__page-section-item-title">
<span class="title">
<?php if ($block->getNoUseOrderLink()): ?>
- <?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php /* @escapeNotVerified */ echo $_email ?></span>)
+ <?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php echo $block->escapeHtml($_email) ?></span>)
<?php else: ?>
<a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order->getId()) ?>"><?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?></a>
- <span>(<?php /* @escapeNotVerified */ echo $_email ?>)</span>
+ <span>(<?php echo $block->escapeHtml($_email) ?>)</span>
<?php endif; ?>
</span>
</div>
@@ -49,7 +49,7 @@ $orderStoreDate = $block->formatDate(
<table class="admin__table-secondary order-information-table">
<tr>
<th><?php /* @escapeNotVerified */ echo __('Order Date') ?></th>
- <td><?php /* @escapeNotVerified */ echo $orderAdminDate ?></td>
+ <td><?php echo $block->escapeHtml($orderAdminDate) ?></td>
</tr>
<?php if ($orderAdminDate != $orderStoreDate):?>
<tr>
@@ -57,12 +57,12 @@ $orderStoreDate = $block->formatDate(
'Order Date (%1)',
$block->getTimezoneForStore($_order->getStore())
) ?></th>
- <td><?php /* @escapeNotVerified */ echo $orderStoreDate ?></td>
+ <td><?php echo $block->escapeHtml($orderStoreDate) ?></td>
</tr>
<?php endif;?>
<tr>
<th><?php /* @escapeNotVerified */ echo __('Order Status') ?></th>
- <td><span id="order_status"><?php /* @escapeNotVerified */ echo $_order->getStatusLabel() ?></span></td>
+ <td><span id="order_status"><?php echo $block->escapeHtml($_order->getStatusLabel()) ?></span></td>
</tr>
<?php echo $block->getChildHtml(); ?>
<?php if ($block->isSingleStoreMode() == false):?>
@@ -136,13 +136,13 @@ $orderStoreDate = $block->formatDate(
<?php if ($_groupName = $block->getCustomerGroupName()) : ?>
<tr>
<th><?php /* @escapeNotVerified */ echo __('Customer Group') ?></th>
- <td><?php /* @escapeNotVerified */ echo $_groupName ?></td>
+ <td><?php echo $block->escapeHtml($_groupName) ?></td>
</tr>
<?php endif; ?>
<?php foreach ($block->getCustomerAccountData() as $data):?>
<tr>
- <th><?php /* @escapeNotVerified */ echo $data['label'] ?></th>
- <td><?php /* @escapeNotVerified */ echo $data['value'] ?></td>
+ <th><?php echo $block->escapeHtml($data['label']) ?></th>
+ <td><?php echo $block->escapeHtml($data['value']) ?></td>
</tr>
<?php endforeach;?>
</table>
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index ff72ce7f002..d7f9075cdd3 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-sales-inventory",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index fabef581762..8479acad472 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-rule": "100.2.*",
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index eeda2be05e6..5b9efe61f72 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-sales-sequence",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 936bbf0d6be..4c98a5abd3a 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-sample-data",
"description": "Sample Data fixtures",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"suggest": {
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index cc95e678452..8f809fb3b8a 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-catalog-search": "100.2.*",
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index f64c0f0b29d..4048b63bf60 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-security",
"description": "Security management module",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index de9dbf7a845..1095dedc0ba 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-send-friend",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-customer": "100.2.*",
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index dc9ea808c0f..03f51bbd95e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-sales": "100.2.*",
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index be553a4da19..9f556178fc2 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index b9f76f6c2c3..d5b8a2b4b98 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-directory": "100.2.*",
"magento/module-ui": "100.2.*",
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index dc2d1cbee00..47e347426c8 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-swagger",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index f87fdb635cb..b61ff41d8c9 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-swatches",
"description": "Add Swatches to Products",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-configurable-product": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index 9b658d0a42e..67c6d90c51e 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-swatches-layered-navigation",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/magento-composer-installer": "*"
},
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 4553fdbb383..3dfacaaecd9 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-config": "100.2.*",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index c3d09e4926e..9d9cac5dec5 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-tax": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-directory": "100.2.*",
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 49382f9642f..7158ac31407 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 9ea00544d80..b9ed830c905 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/module-developer": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 43c7b7fa301..a3de6c6dfbd 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-eav": "100.2.*",
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index ade4e738a68..c20dd28ba88 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-sales": "100.2.*",
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index ac75ecdf61b..290ffc6731d 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-catalog": "101.1.*",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*",
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 755c47ac114..4632e32bc17 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-authorization": "100.2.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 5baccddf488..15e93d0bea4 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-shipping": "100.2.*",
"magento/module-directory": "100.2.*",
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index 21f3ec1dd46..e4b06d0edb3 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-variable",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-backend": "100.2.*",
"magento/module-email": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 74dd568e3b4..b2edf040674 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-vault",
"description": "",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-store": "100.2.*",
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index 3a972432101..4396f1fb2b3 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-version",
"description": "N/A",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index f2796df70a8..6fc712722ad 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-authorization": "100.2.*",
"magento/module-integration": "100.2.*",
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 506975f1aa1..0f4ef7b3dc8 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-webapi-security",
"description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-webapi": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 035d66e5a96..70fd4a25d03 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-tax": "100.2.*",
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index f59c4180eb2..b5a5e9e5569 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-cms": "101.1.*",
"magento/module-backend": "100.2.*",
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 3faee891249..b341edde760 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-catalog": "101.1.*",
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 29569db622d..ff0eda055bb 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-theme",
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 27ed40860dd..7c03167ebc2 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.2.*"
},
"type": "magento2-theme",
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 98fe0ebf806..97eb48f3c7e 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/theme-frontend-blank": "100.2.*",
"magento/framework": "100.2.*"
},
diff --git a/composer.json b/composer.json
index fed44651407..f9e49415d6a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"AFL-3.0"
],
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"zendframework/zend-stdlib": "~2.4.6",
"zendframework/zend-code": "~2.4.6",
"zendframework/zend-server": "~2.4.6",
diff --git a/composer.lock b/composer.lock
index 7feb568d766..02f0e31a325 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "c23e80be1cc71ab108ce5ac19b3fe509",
- "content-hash": "5b9734c1bdbda68cf20507525cafa0f2",
+ "hash": "1f34dce6d48c9e4e694c27e001414000",
+ "content-hash": "600aca1692cf3fe5c2ea1cbf66de09ab",
"packages": [
{
"name": "braintree/braintree_php",
@@ -56,7 +56,7 @@
},
{
"name": "colinmollenhour/cache-backend-file",
- "version": "1.4",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
@@ -818,16 +818,16 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.2",
+ "version": "v2.0.3",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
+ "reference": "c0125896dbb151380ab47e96c621741e79623beb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c0125896dbb151380ab47e96c621741e79623beb",
+ "reference": "c0125896dbb151380ab47e96c621741e79623beb",
"shasum": ""
},
"require": {
@@ -862,7 +862,7 @@
"pseudorandom",
"random"
],
- "time": "2016-04-03 06:00:07"
+ "time": "2016-10-17 15:23:22"
},
{
"name": "pelago/emogrifier",
@@ -922,16 +922,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.3",
+ "version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "41f85e9c2582b3f6d1b7d20395fb40c687ad5370"
+ "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/41f85e9c2582b3f6d1b7d20395fb40c687ad5370",
- "reference": "41f85e9c2582b3f6d1b7d20395fb40c687ad5370",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
+ "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
"shasum": ""
},
"require": {
@@ -1010,20 +1010,20 @@
"x.509",
"x509"
],
- "time": "2016-08-18 18:49:14"
+ "time": "2016-10-04 00:57:04"
},
{
"name": "psr/log",
- "version": "1.0.1",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "5277094ed527a1c4477177d102fe4c53551953e0"
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0",
- "reference": "5277094ed527a1c4477177d102fe4c53551953e0",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
"shasum": ""
},
"require": {
@@ -1057,7 +1057,7 @@
"psr",
"psr-3"
],
- "time": "2016-09-19 16:02:08"
+ "time": "2016-10-10 12:19:37"
},
{
"name": "ramsey/uuid",
@@ -1390,7 +1390,7 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1450,7 +1450,7 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
@@ -1499,16 +1499,16 @@
},
{
"name": "symfony/finder",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577"
+ "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/e568ef1784f447a0e54dcb6f6de30b9747b0f577",
- "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
+ "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f",
"shasum": ""
},
"require": {
@@ -1544,20 +1544,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-08-26 12:04:02"
+ "time": "2016-09-28 00:11:12"
},
{
"name": "symfony/process",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "05a03ed27073638658cab9405d99a67dd1014987"
+ "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/05a03ed27073638658cab9405d99a67dd1014987",
- "reference": "05a03ed27073638658cab9405d99a67dd1014987",
+ "url": "https://api.github.com/repos/symfony/process/zipball/024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
+ "reference": "024de37f8a6b9e5e8244d9eb3fcf3e467dd2a93f",
"shasum": ""
},
"require": {
@@ -1593,7 +1593,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 10:55:00"
+ "time": "2016-09-29 14:03:54"
},
{
"name": "tedivm/jshrink",
@@ -4329,16 +4329,16 @@
},
{
"name": "symfony/config",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84"
+ "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/005bf10c156335ede2e89fb9a9ee10a0b742bc84",
- "reference": "005bf10c156335ede2e89fb9a9ee10a0b742bc84",
+ "url": "https://api.github.com/repos/symfony/config/zipball/f8b1922bbda9d2ac86aecd649399040bce849fde",
+ "reference": "f8b1922bbda9d2ac86aecd649399040bce849fde",
"shasum": ""
},
"require": {
@@ -4378,20 +4378,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2016-08-16 14:56:08"
+ "time": "2016-09-14 20:31:12"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9"
+ "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0a732a9cafc30e54077967da4d019e1d618a8cb9",
- "reference": "0a732a9cafc30e54077967da4d019e1d618a8cb9",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ee9ec9ac2b046462d341e9de7c4346142d335e75",
+ "reference": "ee9ec9ac2b046462d341e9de7c4346142d335e75",
"shasum": ""
},
"require": {
@@ -4441,11 +4441,11 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2016-09-06 23:19:39"
+ "time": "2016-09-24 09:47:20"
},
{
"name": "symfony/stopwatch",
- "version": "v3.1.4",
+ "version": "v3.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
@@ -4494,7 +4494,7 @@
},
{
"name": "symfony/yaml",
- "version": "v2.8.11",
+ "version": "v2.8.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
@@ -4590,7 +4590,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"lib-libxml": "*",
"ext-ctype": "*",
"ext-gd": "*",
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
index 629afd442a4..00888c7baf7 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleIntegrationFromConfig/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-test-module-integration-from-config",
"description": "test integration create from config",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "0.42.0-beta8",
"magento/module-integration": "0.42.0-beta8"
},
@@ -16,4 +16,4 @@
]
]
}
-}
\ No newline at end of file
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
index 1e2d9c0fa13..a9aa5a2ede8 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
+++ b/dev/tests/api-functional/_files/Magento/TestModuleJoinDirectives/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-test-join-directives",
"description": "test integration for join directives",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "0.42.0-beta8",
"magento/module-sales": "0.42.0-beta8"
},
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
index 512c5bc8d5d..cef14516786 100644
--- a/dev/tests/functional/composer.json
+++ b/dev/tests/functional/composer.json
@@ -1,7 +1,7 @@
{
"require": {
"magento/mtf": "1.0.0-rc48",
- "php": "~5.6.0|7.0.2|~7.0.6",
+ "php": "~5.6.5|7.0.2|~7.0.6",
"phpunit/phpunit": "~4.8.0|~5.5.0",
"phpunit/phpunit-selenium": ">=1.2"
},
diff --git a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
index 4d6383045d2..3e8e5650b85 100644
--- a/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
+++ b/dev/tests/integration/_files/Magento/TestModuleSample/composer.json
@@ -2,7 +2,7 @@
"name": "magento/module-sample-test",
"description": "test sample module",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "100.1.*",
"magento/module-integration": "100.1.*"
},
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
index 34a484f749b..54a068dad5d 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -229,4 +229,51 @@ class CartTest extends \Magento\TestFramework\TestCase\AbstractController
}
return null;
}
+
+ /**
+ * Test for \Magento\Checkout\Controller\Cart::execute() with simple product
+ *
+ * @param string $area
+ * @param string $expectedPrice
+ * @magentoDataFixture Magento/Catalog/_files/products.php
+ * @magentoAppIsolation enabled
+ * @dataProvider addAddProductDataProvider
+ */
+ public function testAddToCartSimpleProduct($area, $expectedPrice)
+ {
+ $formKey = $this->_objectManager->get(\Magento\Framework\Data\Form\FormKey::class);
+ $postData = [
+ 'qty' => '1',
+ 'product' => '1',
+ 'custom_price' => 1,
+ 'form_key' => $formKey->getFormKey(),
+ 'isAjax' => 1
+ ];
+ \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea($area);
+ $this->getRequest()->setPostValue($postData);
+
+ $quote = $this->_objectManager->create(\Magento\Checkout\Model\Cart::class);
+ /** @var \Magento\Checkout\Controller\Cart\Add $controller */
+ $controller = $this->_objectManager->create(\Magento\Checkout\Controller\Cart\Add::class, [$quote]);
+ $controller->execute();
+
+ $this->assertContains(json_encode([]), $this->getResponse()->getBody());
+ $items = $quote->getItems()->getItems();
+ $this->assertTrue(is_array($items), 'Quote doesn\'t have any items');
+ $this->assertCount(1, $items, 'Expected quote items not equal to 1');
+ $item = reset($items);
+ $this->assertEquals(1, $item->getProductId(), 'Quote has more than one product');
+ $this->assertEquals($expectedPrice, $item->getPrice(), 'Expected product price failed');
+ }
+
+ /**
+ * Data provider for testAddToCartSimpleProduct
+ */
+ public function addAddProductDataProvider()
+ {
+ return [
+ 'frontend' => ['frontend', 'expected_price' => 10],
+ 'adminhtml' => ['adminhtml', 'expected_price' => 1]
+ ];
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
new file mode 100644
index 00000000000..c44e320e64f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Controller\Section;
+
+class LoadTest extends \Magento\TestFramework\TestCase\AbstractController
+{
+ public function testLoadInvalidSection()
+ {
+ $expected = [
+ 'message' => '"section<invalid" section source is not supported',
+ ];
+ $this->dispatch('/customer/section/load/?sections=section<invalid&update_section_id=false&_=147066166394');
+ self::assertEquals(json_encode($expected), $this->getResponse()->getBody());
+ }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
index 8a566a0d4ef..14118414859 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -12,6 +12,7 @@
namespace Magento\Framework\DB\Adapter\Pdo;
use Magento\Framework\App\ResourceConnection;
+use Zend_Db_Statement_Exception;
class MysqlTest extends \PHPUnit_Framework_TestCase
{
@@ -32,6 +33,7 @@ class MysqlTest extends \PHPUnit_Framework_TestCase
restore_error_handler();
}
+
/**
* Test lost connection re-initializing
*
@@ -125,9 +127,9 @@ class MysqlTest extends \PHPUnit_Framework_TestCase
protected function _getConnection()
{
if (is_null($this->_connection)) {
- /** @var $coreResource \Magento\Framework\App\ResourceConnection */
+ /** @var $coreResource ResourceConnection */
$coreResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
- ->get(\Magento\Framework\App\ResourceConnection::class);
+ ->get(ResourceConnection::class);
$this->_connection = $coreResource->getConnection();
}
return $this->_connection;
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
index 222e5ff822b..a004d3a86b5 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/A/composer.json
@@ -1,7 +1,7 @@
{
"name": "magento/module-a",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "0.1",
"magento/module-b": "0.1"
},
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
index 57944758267..0626cc6a84d 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/app/code/Magento/B/composer.json
@@ -1,7 +1,7 @@
{
"name": "magento/module-b",
"require": {
- "php": "~5.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "0.74.0-beta6",
"magento/module-a": "0.1"
},
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 920dc1289b0..47f9eb415d7 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"magento/framework": "0.1.0-alpha103"
},
"type": "magento2-theme",
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index cfbeb4f54c9..9af29ab2c45 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -341,6 +341,9 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
/**
* Creates a PDO object and connects to the database.
*
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
+ *
* @return void
* @throws \Zend_Db_Adapter_Exception
*/
@@ -371,6 +374,10 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
list($this->_config['host'], $this->_config['port']) = explode(':', $this->_config['host']);
}
+ if (!isset($this->_config['driver_options'][\PDO::MYSQL_ATTR_MULTI_STATEMENTS])) {
+ $this->_config['driver_options'][\PDO::MYSQL_ATTR_MULTI_STATEMENTS] = false;
+ }
+
$this->logger->startTimer();
parent::_connect();
$this->logger->logStats(LoggerInterface::TYPE_CONNECT, '');
@@ -562,6 +569,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @throws \Zend_Db_Adapter_Exception To re-throw \PDOException.
* @throws LocalizedException In case multiple queries are attempted at once, to protect from SQL injection
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @deprecated
*/
public function multiQuery($sql, $bind = [])
{
@@ -728,6 +736,8 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
+
+ * @deprecated
*/
protected function _splitMultiQuery($sql)
{
diff --git a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
index 10f1289b90c..ad4746a3651 100644
--- a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
+++ b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
@@ -31,7 +31,7 @@ class MaliciousCode implements \Zend_Filter_Interface
//js attributes
'/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onload|onunload|onerror)=[^<]*(?=\/*\>)/Uis',
//tags
- '/<\/?(script|meta|link|frame|iframe).*>/Uis',
+ '/<\/?(script|meta|link|frame|iframe|object).*>/Uis',
//base64 usage
'/src=[^<]*base64[^<]*(?=\/*\>)/Uis',
];
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
index 512d8e89750..93de72e3c57 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
@@ -89,6 +89,7 @@ class MaliciousCodeTest extends \PHPUnit_Framework_TestCase
'Tag is removed <link>SomeLink</link>',
'Tag is removed <frame>SomeFrame</frame>',
'Tag is removed <iframe>SomeIFrame</iframe>',
+ 'Tag is removed <object>SomeObject</object>',
],
[
'Tag is removed SomeScript',
@@ -96,6 +97,7 @@ class MaliciousCodeTest extends \PHPUnit_Framework_TestCase
'Tag is removed SomeLink',
'Tag is removed SomeFrame',
'Tag is removed SomeIFrame',
+ 'Tag is removed SomeObject',
],
],
'Base64' => [
diff --git a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
index fb00e9f59c8..181783c7b21 100644
--- a/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
+++ b/lib/internal/Magento/Framework/HTTP/Adapter/Curl.php
@@ -20,7 +20,15 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
*
* @var array
*/
- protected $_config = [];
+ protected $_config = [
+ 'protocols' => (CURLPROTO_HTTP
+ | CURLPROTO_HTTPS
+ | CURLPROTO_FTP
+ | CURLPROTO_FTPS
+ ),
+ 'verifypeer' => true,
+ 'verifyhost' => 2,
+ ];
/**
* Curl handle
@@ -41,7 +49,10 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
'ssl_cert' => CURLOPT_SSLCERT,
'userpwd' => CURLOPT_USERPWD,
'useragent' => CURLOPT_USERAGENT,
- 'referer' => CURLOPT_REFERER
+ 'referer' => CURLOPT_REFERER,
+ 'protocols' => CURLOPT_PROTOCOLS,
+ 'verifypeer' => CURLOPT_SSL_VERIFYPEER,
+ 'verifyhost' => CURLOPT_SSL_VERIFYHOST,
];
/**
@@ -55,8 +66,6 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
* Apply current configuration array to transport resource
*
* @return \Magento\Framework\HTTP\Adapter\Curl
- * @SuppressWarnings(PHPMD.NPathComplexity)
- * @SuppressWarnings(PHPMD.UnusedLocalVariable)
*/
protected function _applyConfig()
{
@@ -65,22 +74,28 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
curl_setopt($this->_getResource(), $option, $value);
}
- if (empty($this->_config)) {
- return $this;
+ // apply config options
+ foreach ($this->getDefaultConfig() as $option => $value) {
+ curl_setopt($this->_getResource(), $option, $value);
}
- $verifyPeer = isset($this->_config['verifypeer']) ? $this->_config['verifypeer'] : true;
- curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYPEER, $verifyPeer);
-
- $verifyHost = isset($this->_config['verifyhost']) ? $this->_config['verifyhost'] : 2;
- curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYHOST, $verifyHost);
+ return $this;
+ }
- foreach ($this->_config as $param => $curlOption) {
+ /**
+ * Get default options
+ *
+ * @return array
+ */
+ private function getDefaultConfig()
+ {
+ $config = [];
+ foreach (array_keys($this->_config) as $param) {
if (array_key_exists($param, $this->_allowedParams)) {
- curl_setopt($this->_getResource(), $this->_allowedParams[$param], $this->_config[$param]);
+ $config[$this->_allowedParams[$param]] = $this->_config[$param];
}
}
- return $this;
+ return $config;
}
/**
@@ -116,7 +131,9 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
*/
public function setConfig($config = [])
{
- $this->_config = $config;
+ foreach ($config as $key => $value) {
+ $this->_config[$key] = $value;
+ }
return $this;
}
@@ -268,6 +285,13 @@ class Curl implements \Zend_Http_Client_Adapter_Interface
$multihandle = curl_multi_init();
+ // add default parameters
+ foreach ($this->getDefaultConfig() as $defaultOption => $defaultValue) {
+ if (!isset($options[$defaultOption])) {
+ $options[$defaultOption] = $defaultValue;
+ }
+ }
+
foreach ($urls as $key => $url) {
$handles[$key] = curl_init();
curl_setopt($handles[$key], CURLOPT_URL, $url);
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
index 255be0a5596..37cd33d1868 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
@@ -10,10 +10,14 @@ use \Magento\Framework\HTTP\Adapter\Curl;
class CurlTest extends \PHPUnit_Framework_TestCase
{
- /** @var Curl */
+ /**
+ * @var Curl
+ */
protected $model;
- /** @var \Closure */
+ /**
+ * @var \Closure
+ */
public static $curlExectClosure;
protected function setUp()
@@ -42,4 +46,3 @@ class CurlTest extends \PHPUnit_Framework_TestCase
];
}
}
-
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index e8013b024f4..a517f1fd0b0 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -298,6 +298,7 @@ class SessionManager implements SessionManagerInterface
return;
}
+ session_regenerate_id(true);
session_destroy();
if ($options['send_expire_cookie']) {
$this->expireSessionCookie();
diff --git a/lib/internal/Magento/Framework/Validator/AllowedProtocols.php b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
new file mode 100644
index 00000000000..3c7bbb3d997
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Protocol validator
+ *
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Validator;
+
+use \Zend\Uri\Uri;
+
+/**
+ * Check is URI starts from allowed protocol
+ *
+ * Class AllowedProtocols
+ * @package Magento\Framework\Validator
+ */
+class AllowedProtocols extends AbstractValidator
+{
+ /**
+ * List of supported protocols
+ *
+ * @var array
+ */
+ private $listOfProtocols = [
+ 'http',
+ 'https',
+ ];
+
+ /**
+ * Constructor.
+ * @param array $listOfProtocols
+ */
+ public function __construct($listOfProtocols = [])
+ {
+ if (count($listOfProtocols)) {
+ $this->listOfProtocols = $listOfProtocols;
+ }
+ }
+
+ /**
+ * Validate URI
+ *
+ * @param string $value
+ * @return bool
+ */
+ public function isValid($value)
+ {
+ $uri = new Uri($value);
+ $isValid = in_array(
+ strtolower($uri->getScheme()),
+ $this->listOfProtocols
+ );
+ if (!$isValid) {
+ $this->_addMessages(["Protocol isn't allowed"]);
+ }
+ return $isValid;
+ }
+}
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 98338ed4b09..926d4cc54c1 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.6.0|7.0.2|7.0.4|~7.0.6",
+ "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
"ext-spl": "*",
"ext-dom": "*",
"ext-simplexml": "*",
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
index 6a4b3a72b37..935f395a5e2 100644
--- a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
+++ b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
@@ -99,10 +99,10 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
}
/**
- * Check if user login
+ * Check if user logged-in and has permissions
*
* @param \Zend\Mvc\MvcEvent $event
- * @return bool
+ * @return false|\Zend\Http\Response
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function authPreDispatch($event)
@@ -115,6 +115,7 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
/** @var Application $application */
$application = $event->getApplication();
$serviceManager = $application->getServiceManager();
+
if ($serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
/** @var \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider */
$objectManagerProvider = $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class);
@@ -135,17 +136,26 @@ class InitParamListener implements ListenerAggregateInterface, FactoryInterface
'appState' => $adminAppState
]
);
- if (!$objectManager->get(\Magento\Backend\Model\Auth::class)->isLoggedIn()) {
+ /** @var \Magento\Backend\Model\Auth $auth */
+ $authentication = $objectManager->get(\Magento\Backend\Model\Auth::class);
+
+ if (
+ !$authentication->isLoggedIn() ||
+ !$adminSession->isAllowed('Magento_Backend::setup_wizard')
+ ) {
$adminSession->destroy();
+ /** @var \Zend\Http\Response $response */
$response = $event->getResponse();
$baseUrl = Http::getDistroBaseUrlPath($_SERVER);
$response->getHeaders()->addHeaderLine('Location', $baseUrl . 'index.php/session/unlogin');
$response->setStatusCode(302);
$event->stopPropagation();
+
return $response;
}
}
}
+
return false;
}
diff --git a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
index 558533afe92..1ace3f452c4 100644
--- a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
@@ -3,7 +3,6 @@
* Copyright © 2016 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-
namespace Magento\Setup\Test\Unit\Mvc\Bootstrap;
use \Magento\Setup\Mvc\Bootstrap\InitParamListener;
@@ -59,11 +58,11 @@ class InitParamListenerTest extends \PHPUnit_Framework_TestCase
->withConsecutive(
[
\Magento\Framework\App\Filesystem\DirectoryList::class,
- $this->isInstanceOf(\Magento\Framework\App\Filesystem\DirectoryList::class)
+ $this->isInstanceOf(\Magento\Framework\App\Filesystem\DirectoryList::class),
],
[
\Magento\Framework\Filesystem::class,
- $this->isInstanceOf(\Magento\Framework\Filesystem::class)
+ $this->isInstanceOf(\Magento\Framework\Filesystem::class),
]
);
$mvcApplication->expects($this->any())->method('getServiceManager')->willReturn($serviceManager);
@@ -130,10 +129,10 @@ class InitParamListenerTest extends \PHPUnit_Framework_TestCase
$request->expects($this->any())
->method('getContent')
->willReturn(
- $cliParam ? ['install', '--magento-init-params=' . $cliParam ] : ['install']
+ $cliParam ? ['install', '--magento-init-params=' . $cliParam] : ['install']
);
$mvcApplication->expects($this->any())->method('getConfig')->willReturn(
- $zfAppConfig ? [InitParamListener::BOOTSTRAP_PARAM => $zfAppConfig]:[]
+ $zfAppConfig ? [InitParamListener::BOOTSTRAP_PARAM => $zfAppConfig] : []
);
$mvcApplication->expects($this->any())->method('getRequest')->willReturn($request);
@@ -150,41 +149,55 @@ class InitParamListenerTest extends \PHPUnit_Framework_TestCase
'mage_mode App' => [['MAGE_MODE' => 'developer'], [], '', ['MAGE_MODE' => 'developer']],
'mage_mode Env' => [[], ['MAGE_MODE' => 'developer'], '', ['MAGE_MODE' => 'developer']],
'mage_mode CLI' => [[], [], 'MAGE_MODE=developer', ['MAGE_MODE' => 'developer']],
- 'one MAGE_DIRS CLI' => [[], [], 'MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2']], 'MAGE_MODE' => 'developer']],
+ 'one MAGE_DIRS CLI' => [
+ [],
+ [],
+ 'MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2',
+ ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2']], 'MAGE_MODE' => 'developer'],
+ ],
'two MAGE_DIRS CLI' => [
[],
[],
'MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2'], 'cache' => ['path' => '/tmp/cache']],
- 'MAGE_MODE' => 'developer']],
+ [
+ 'MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2'], 'cache' => ['path' => '/tmp/cache']],
+ 'MAGE_MODE' => 'developer',
+ ],
+ ],
'mage_mode only' => [[], [], 'MAGE_MODE=developer', ['MAGE_MODE' => 'developer']],
'MAGE_DIRS Env' => [
[],
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2']], 'MAGE_MODE' => 'developer'],
'',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2']], 'MAGE_MODE' => 'developer']],
+ ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2']], 'MAGE_MODE' => 'developer'],
+ ],
'two MAGE_DIRS' => [
[],
[],
'MAGE_MODE=developer&MAGE_DIRS[base][path]=/var/www/magento2&MAGE_DIRS[cache][path]=/tmp/cache',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2'], 'cache' => ['path' => '/tmp/cache']],
- 'MAGE_MODE' => 'developer']],
+ [
+ 'MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2'], 'cache' => ['path' => '/tmp/cache']],
+ 'MAGE_MODE' => 'developer',
+ ],
+ ],
'Env overwrites App' => [
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/App']], 'MAGE_MODE' => 'developer'],
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/Env']], 'MAGE_MODE' => 'developer'],
'',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/Env']], 'MAGE_MODE' => 'developer']],
+ ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/Env']], 'MAGE_MODE' => 'developer'],
+ ],
'CLI overwrites Env' => [
['MAGE_MODE' => 'developerApp'],
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/Env']]],
'MAGE_DIRS[base][path]=/var/www/magento2/CLI',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/CLI']], 'MAGE_MODE' => 'developerApp']],
+ ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/CLI']], 'MAGE_MODE' => 'developerApp'],
+ ],
'CLI overwrites All' => [
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/App']], 'MAGE_MODE' => 'production'],
['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/Env']]],
'MAGE_DIRS[base][path]=/var/www/magento2/CLI',
- ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/CLI']], 'MAGE_MODE' => 'production']],
+ ['MAGE_DIRS' => ['base' => ['path' => '/var/www/magento2/CLI']], 'MAGE_MODE' => 'production'],
+ ],
];
}
@@ -226,6 +239,168 @@ class InitParamListenerTest extends \PHPUnit_Framework_TestCase
[$this->listener, 'onBootstrap']
)->willReturn($this->callbackHandler);
$eventManager->expects($this->once())->method('getSharedManager')->willReturn($sharedManager);
+
return $eventManager;
}
+
+ /**
+ * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ */
+ public function testAuthPreDispatch()
+ {
+ $eventMock = $this->getMockBuilder(\Zend\Mvc\MvcEvent::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $routeMatchMock = $this->getMockBuilder(\Zend\Mvc\Router\Http\RouteMatch::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $applicationMock = $this->getMockBuilder(\Zend\Mvc\Application::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $serviceManagerMock = $this->getMockBuilder(\Zend\ServiceManager\ServiceManager::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $deploymentConfigMock = $this->getMockBuilder(\Magento\Framework\App\DeploymentConfig::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $deploymentConfigMock->expects($this->once())
+ ->method('isAvailable')
+ ->willReturn(true);
+ $omProvider = $this->getMockBuilder(\Magento\Setup\Model\ObjectManagerProvider::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $objectManagerMock = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
+ $adminAppStateMock = $this->getMockBuilder(\Magento\Framework\App\State::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $sessionConfigMock = $this->getMockBuilder(\Magento\Backend\Model\Session\AdminConfig::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $backendAppListMock = $this->getMockBuilder(\Magento\Backend\App\BackendAppList::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $backendAppMock = $this->getMockBuilder(\Magento\Backend\App\BackendApp::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $backendUrlFactoryMock = $this->getMockBuilder(\Magento\Backend\Model\UrlFactory::class)
+ ->setMethods(['create'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $backendUrlMock = $this->getMockBuilder(\Magento\Backend\Model\Url::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $authenticationMock = $this->getMockBuilder(\Magento\Backend\Model\Auth::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $adminSessionMock = $this->getMockBuilder(\Magento\Backend\Model\Auth\Session::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $responseMock = $this->getMockBuilder(\Zend\Http\Response::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $headersMock = $this->getMockBuilder(\Zend\Http\Headers::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $routeMatchMock->expects($this->once())
+ ->method('getParam')
+ ->with('controller')
+ ->willReturn('testController');
+ $eventMock->expects($this->once())
+ ->method('getRouteMatch')
+ ->willReturn($routeMatchMock);
+ $eventMock->expects($this->once())
+ ->method('getApplication')
+ ->willReturn($applicationMock);
+ $serviceManagerMock->expects($this->any())
+ ->method('get')
+ ->willReturnMap(
+ [
+ [
+ \Magento\Framework\App\DeploymentConfig::class,
+ true,
+ $deploymentConfigMock,
+ ],
+ [
+ \Magento\Setup\Model\ObjectManagerProvider::class,
+ true,
+ $omProvider,
+ ],
+ ]
+ );
+ $objectManagerMock->expects($this->any())
+ ->method('get')
+ ->willReturnMap(
+ [
+ [
+ \Magento\Framework\App\State::class,
+ $adminAppStateMock,
+ ],
+ [
+ \Magento\Backend\Model\Session\AdminConfig::class,
+ $sessionConfigMock,
+ ],
+ [
+ \Magento\Backend\App\BackendAppList::class,
+ $backendAppListMock,
+ ],
+ [
+ \Magento\Backend\Model\UrlFactory::class,
+ $backendUrlFactoryMock,
+ ],
+ [
+ \Magento\Backend\Model\Auth::class,
+ $authenticationMock,
+ ],
+ ]
+ );
+ $objectManagerMock->expects($this->any())
+ ->method('create')
+ ->willReturn($adminSessionMock);
+ $omProvider->expects($this->once())
+ ->method('get')
+ ->willReturn($objectManagerMock);
+ $adminAppStateMock->expects($this->once())
+ ->method('setAreaCode')
+ ->with(\Magento\Framework\App\Area::AREA_ADMINHTML);
+ $applicationMock->expects($this->once())
+ ->method('getServiceManager')
+ ->willReturn($serviceManagerMock);
+ $backendAppMock->expects($this->once())
+ ->method('getCookiePath')
+ ->willReturn('');
+ $backendUrlFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($backendUrlMock);
+ $backendAppListMock->expects($this->once())
+ ->method('getBackendApp')
+ ->willReturn($backendAppMock);
+ $authenticationMock->expects($this->once())
+ ->method('isLoggedIn')
+ ->willReturn(true);
+ $adminSessionMock->expects($this->once())
+ ->method('isAllowed')
+ ->with('Magento_Backend::setup_wizard', null)
+ ->willReturn(false);
+ $adminSessionMock->expects($this->once())
+ ->method('destroy');
+ $eventMock->expects($this->once())
+ ->method('getResponse')
+ ->willReturn($responseMock);
+ $responseMock->expects($this->once())
+ ->method('getHeaders')
+ ->willReturn($headersMock);
+ $headersMock->expects($this->once())
+ ->method('addHeaderLine');
+ $responseMock->expects($this->once())
+ ->method('setStatusCode')
+ ->with(302);
+ $eventMock->expects($this->once())
+ ->method('stopPropagation');
+
+ $this->assertSame(
+ $this->listener->authPreDispatch($eventMock),
+ $responseMock
+ );
+ }
}
--
GitLab