diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f3982650aa41452a8a9278f0e0ae6613cae69ab..31cb8dff708ee9dc46ba8a1d67159a8fe93f5269 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +0.42.0-beta11 +============= +* Various improvements: + * Added LICENSE to Developer module + * Refactored Catalog and related module to use mutable data object interface + * Refactored Sales and related modules to use mutable data interfaces +* Setup: + * Added styles for new module enabling / disabling section in Installation wizard + * Modules Install and upgrade capabilities are refactored to implement interfaces used by Setup application +* Framework: + * Moved/refactored Magento\IO\Sftp adapter into Filesystem library + * Removed Magento IO library + * Implemented Dynamic Types Binding in SOAP + * Implemented Extensible Attributes generation + * Improved Web API Related Code Quality + * Moved Specific Helper Components From the Magento/Core Module to Magento/Framework +* Performance: + * Inline JS code is eliminated + * Created fixture for changing Magento config update via Performance Toolkit Generator +* Fixed bugs: + * Issue with multiple addresses checkout + * Issue with catalog page update after a product status changes + * Issue with distance between "Log in" & "or" & "Register" in Frontend header + * Issue with tax details and amounts in frontend and backend order + * JavaScript error when clicking on toggle arrow to show FPT in shopping cart + * PHP Warning when trying to checkout with Multiple Addresses on review order page +* Functional tests: + * Refactored end-to-end test for order placement from backend and for OnePageCheckout +* GitHub requests: + * [#1035] (https://github.com/magento/magento2/issues/1035) -- Bug in Magento\Framework\Simplexml\Element::appendChild + * [#1053] (https://github.com/magento/magento2/issues/1053) -- #865: add getParams/setParam to RequestInterface + * [#1066] (https://github.com/magento/magento2/issues/1066) -- PHP 5.5.16-1+deb.sury.org~precise+1 + 0.42.0-beta10 ============= * Framework diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index 955ba5eb589228bea6c42a2c4edf1ba974d8dec4..faf93f3ce5e415ba8c380067ee7504432d168f5c 100644 --- a/app/code/Magento/AdminNotification/composer.json +++ b/app/code/Magento/AdminNotification/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 6285745931d6247c10c39b8875ae58684f45c097..d2a5c21759bde47605eacd07ab2ac6abe67e69ea 100644 --- a/app/code/Magento/Authorization/composer.json +++ b/app/code/Magento/Authorization/composer.json @@ -3,12 +3,12 @@ "description": "Authorization module provides access to Magento ACL functionality.", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index 06f4b1b6d18d1f229998c9864751559fca0f505e..33daed277cc4b124fdeedafb5f54564493ceadf4 100644 --- a/app/code/Magento/Backend/composer.json +++ b/app/code/Magento/Backend/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-developer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-cron": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-reports": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-user": "0.42.0-beta10", - "magento/module-backup": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-translation": "0.42.0-beta10", - "magento/module-require-js": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-developer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-cron": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-reports": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-user": "0.42.0-beta11", + "magento/module-backup": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-translation": "0.42.0-beta11", + "magento/module-require-js": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 3b8172ebdd08ba75b0eaf677843cda0353fddf53..73c91afc1ebc3f09dcb1224d12f2cebc5340f79a 100644 --- a/app/code/Magento/Backup/composer.json +++ b/app/code/Magento/Backup/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-cron": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-cron": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index cdcb95a19cd5de70e86bbf0dcc749c22113640fa..69d80ed65073ba0ddc4bdb03c5ed47f769b3e569 100644 --- a/app/code/Magento/Bundle/composer.json +++ b/app/code/Magento/Bundle/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-catalog-rule": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-gift-message": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-catalog-rule": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-gift-message": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.42.0-beta10" + "magento/module-webapi": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index dcfe5be7700717e291ecf546fa453d91b8b5c333..8203866281b29e5ab54fd3ba2cc27d432c204766 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 825bc8f89545320f815a96aa3988fcdb63fb1163..92b97c635b087e12dfe820a58502df8d5e23322c 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,38 +3,38 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-log": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-msrp": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-catalog-rule": "0.42.0-beta10", - "magento/module-product-alert": "0.42.0-beta10", - "magento/module-url-rewrite": "0.42.0-beta10", - "magento/module-catalog-url-rewrite": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-log": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-msrp": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-catalog-rule": "0.42.0-beta11", + "magento/module-product-alert": "0.42.0-beta11", + "magento/module-url-rewrite": "0.42.0-beta11", + "magento/module-catalog-url-rewrite": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.42.0-beta10" + "magento/module-cookie": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js index 1bb91fd2455e0c679c70df0321b0a579bc34e910..74e1566a8dc5ba6f4691574491bbb6b7b65dcc43 100644 --- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js +++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js @@ -63,6 +63,7 @@ define([ } if (res.minicart) { $(self.options.minicartSelector).replaceWith(res.minicart); + $(self.options.minicartSelector).trigger('contentUpdated'); } if (res.product && res.product.statusText) { $(self.options.productStatusSelector) diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index 4051d93e3b92359dcda60c10733712bca3cbbcf0..e7d2be7e347536cbdbc8fa8e8074517cff30da15 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index cc3973abb35d787503b23bcc89a24478798bd7b8..1f8771b0c1708cb6290a8fb8202fe76a2b88f48c 100644 --- a/app/code/Magento/CatalogInventory/composer.json +++ b/app/code/Magento/CatalogInventory/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 826c4e4dad9dcb11683529a3f9cd8f7b158fea75..6a4603978014cd24961f7b33ab1c3f97af727401 100644 --- a/app/code/Magento/CatalogRule/composer.json +++ b/app/code/Magento/CatalogRule/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-rule": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-rule": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index 5b397d5711bec713281b63749570f283f6aa21cc..6f18c48c09539f25b5ed88d00c92ed9b5334e7c4 100644 --- a/app/code/Magento/CatalogSearch/composer.json +++ b/app/code/Magento/CatalogSearch/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-search": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-search": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index a694a644927dbd93c2257a8b7e3392a40029f590..4a580fe66dccd16f87760604369c6f05f4256b19 100644 --- a/app/code/Magento/CatalogUrlRewrite/composer.json +++ b/app/code/Magento/CatalogUrlRewrite/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-import-export": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-url-rewrite": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-import-export": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-url-rewrite": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index 43ce6593d4b694f5537b14f290a8d3ed5882e09f..38d68cb4be5b1f67ea0aa3462eca11d684c9b1a2 100644 --- a/app/code/Magento/CatalogWidget/composer.json +++ b/app/code/Magento/CatalogWidget/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-rule": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-rule": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json index 3bb6b3678c57ed66291985acdcc32064213cebf6..78cdf53ce4d7b9324bbad2319b41f85dde732814 100644 --- a/app/code/Magento/Centinel/composer.json +++ b/app/code/Magento/Centinel/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 8cf8a2fa98356ef374ecd1cbbc0b390ee0f75d6e..6a4b0255686f84d78b71a80df174311f155b9999 100644 --- a/app/code/Magento/Checkout/composer.json +++ b/app/code/Magento/Checkout/composer.json @@ -3,31 +3,31 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-gift-message": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-msrp": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-gift-message": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-msrp": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.42.0-beta10" + "magento/module-cookie": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index ed94c06f784f9c4f7fab3af93863c06a1eb0bcba..764b8b4e97b92f66fa7f711b7e08fc0ef22c057b 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index fee45096f06610035b3a90901c9cc65b82dc69f3..9384e914ed55cc731ca124669284e5432773b4b1 100644 --- a/app/code/Magento/Cms/composer.json +++ b/app/code/Magento/Cms/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-email": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", - "magento/module-variable": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-email": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", + "magento/module-variable": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index 689224cba6f9bd32e9b55fe91207c33c8ea18c84..584c86836e4a91f043f8c863b54f64c1c73d0daa 100644 --- a/app/code/Magento/CmsUrlRewrite/composer.json +++ b/app/code/Magento/CmsUrlRewrite/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-url-rewrite": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-url-rewrite": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json index fd500d27d0c0e5581b1fc4a49e2ff5748e47cf5b..34ebbca138848ab22af73c0dd1f39fb0deadcebf 100644 --- a/app/code/Magento/Config/composer.json +++ b/app/code/Magento/Config/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-cron": "0.42.0-beta10", - "magento/module-email": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-cron": "0.42.0-beta11", + "magento/module-email": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 55345c3095ea51361b28379999caa0a801811958..b7070263ad41b0cc8bce0435e0e341c80f7fe886 100644 --- a/app/code/Magento/ConfigurableImportExport/composer.json +++ b/app/code/Magento/ConfigurableImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-import-export": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/module-configurable-product": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-import-export": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/module-configurable-product": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index f0805737f7b66e0cef2dcbda5f07e2e5fbd65662..d893a9a579d497a9ffb1e24a944cdf351bc37447 100644 --- a/app/code/Magento/ConfigurableProduct/composer.json +++ b/app/code/Magento/ConfigurableProduct/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-catalog-rule": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-catalog-rule": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.42.0-beta10" + "magento/module-webapi": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index ed86b9ab8f87ad6bbe76e0cbc7a028d37c94aa91..5cf852865c8884a34f1b0d5a7196170762fa292d 100644 --- a/app/code/Magento/Contact/composer.json +++ b/app/code/Magento/Contact/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json index f829e366657bede5dfd46b93e9bce37425d93b6e..677da5785a19e3b5091339135af9fdc2c7b6e7e5 100644 --- a/app/code/Magento/Cookie/composer.json +++ b/app/code/Magento/Cookie/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-backend": "0.42.0-beta10" + "magento/module-backend": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json index 4d814faf9f5e8240fec8369a6ee6b70f3f4f1ece..f32ffb2a52f0fb36d5621b638074afd2626acf2f 100644 --- a/app/code/Magento/Core/composer.json +++ b/app/code/Magento/Core/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index b37aed757556d8dbf8382c3f232aa0522e326f1d..537fc35fcb0e7e8782c198e2172a8725acc286ca 100644 --- a/app/code/Magento/Cron/composer.json +++ b/app/code/Magento/Cron/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index bdd27bd109b1f348fbf429f585ed8973c750b5b6..cf12bc45c09290b14863a145c89b8c52c6d09814 100644 --- a/app/code/Magento/CurrencySymbol/composer.json +++ b/app/code/Magento/CurrencySymbol/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 58896a007088b468f4f062797d01bbe38083ec57..fac52511ebdd845a9b76fbb26ffa8acccbc2a5b6 100644 --- a/app/code/Magento/Customer/composer.json +++ b/app/code/Magento/Customer/composer.json @@ -3,33 +3,33 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-newsletter": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-review": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-integration": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-newsletter": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-review": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-integration": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.42.0-beta10" + "magento/module-cookie": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index 3c4a345a35af544833849ddd82c19ab5972e33a9..13e08d12eaa476831a6bcff80b833a797c93be2b 100644 --- a/app/code/Magento/CustomerImportExport/composer.json +++ b/app/code/Magento/CustomerImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index 38249e6a765c3ea85cab0ee47e754aac8b4ca052..b586021a18a00604aae4aafaf79715569e724084 100644 --- a/app/code/Magento/DesignEditor/composer.json +++ b/app/code/Magento/DesignEditor/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-translation": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-translation": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json index c35a11743502766aabcac8473b3910748ca72f3c..97d4a9ab9538d681a73400e500b4c4f8b002dc75 100644 --- a/app/code/Magento/Developer/composer.json +++ b/app/code/Magento/Developer/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index fbcf8e0fc681384bec05b93aa335d689f1fe766a..024ef97396a6f20436526ca37ff0c47b86c4bb56 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index bd3994b234c04cbe991e43cbd911bda80ec34f43..8e66ab394fbb810a2f46479afb74b859b3472301 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index 465959bea196507dd9a306a034da3fc6cc46a6da..bc329ac59326dfd8271a8a56d34c5fed9634adf1 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-gift-message": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-msrp": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-gift-message": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-msrp": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index c845515b2f0d3e4bbc4bc2a26d3df3174bfdf190..4c271cf979449080663ef1781112db155a6cc3e7 100644 --- a/app/code/Magento/Eav/composer.json +++ b/app/code/Magento/Eav/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 14d772e88a689711b41ed8910fff2c5d1d6bdbd8..7eae5d149b013397761753c02789deb21b2abc46 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-core": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-variable": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-core": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-variable": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 360c5a3a41d65c809c4d03f321520f0db3c1e9d7..9959c31c0264e069e40a70b15d0c145f6222819e 100644 --- a/app/code/Magento/Fedex/composer.json +++ b/app/code/Magento/Fedex/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php index 7fc655d323ab3f2816c55ff433071d19d05ae3f9..55c2b0020c15cea8c26846897e7357693f03e515 100644 --- a/app/code/Magento/GiftMessage/Model/GiftMessageManager.php +++ b/app/code/Magento/GiftMessage/Model/GiftMessageManager.php @@ -79,6 +79,8 @@ class GiftMessageManager $message['to'] )->setMessage( $message['message'] + )->setCustomerId( + $quote->getCustomerId() )->save(); $entity->setGiftMessageId($giftMessage->getId())->save(); diff --git a/app/code/Magento/GiftMessage/Model/Observer.php b/app/code/Magento/GiftMessage/Model/Observer.php index 4c3f7b8bd57c20ba55c88953c65e16aafd8b3d3b..696b4f38f5f6ae96d869838106d96d524bafeb81 100644 --- a/app/code/Magento/GiftMessage/Model/Observer.php +++ b/app/code/Magento/GiftMessage/Model/Observer.php @@ -39,15 +39,27 @@ class Observer extends \Magento\Framework\Object /** * Set gift messages to order from quote address * - * @param \Magento\Framework\Object $observer + * @param \Magento\Framework\Event\Observer $observer * @return $this */ - public function salesEventConvertQuoteToOrder($observer) + public function salesEventQuoteSubmitBefore($observer) { $observer->getEvent()->getOrder()->setGiftMessageId($observer->getEvent()->getQuote()->getGiftMessageId()); return $this; } + /** + * Set gift message to order from address in multiple addresses checkout. + * + * @param \Magento\Framework\Event\Observer $observer + * @return $this + */ + public function multishippingEventCreateOrders($observer) + { + $observer->getEvent()->getOrder()->setGiftMessageId($observer->getEvent()->getAddress()->getGiftMessageId()); + return $this; + } + /** * Duplicates giftmessage from order to quote on import or reorder * diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php index 03139be4a20fb8ada5792188b6fd09b486b1a131..e44dca6dec3c1d412b24f7110c0a695893267aa6 100644 --- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php +++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php @@ -72,7 +72,9 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase 'getAddressById', 'getBillingAddress', 'getShippingAddress', - '__wakeup'], + '__wakeup', + 'getCustomerId' + ], [], '', false); @@ -116,6 +118,7 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase 'setSender', 'setRecipient', 'setMessage', + 'setCustomerId', 'getSender', 'getRecipient', 'getMessage', @@ -184,6 +187,7 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ], ], ]; + $customerId = 42; $this->messageFactoryMock->expects($this->once()) ->method('create') @@ -201,6 +205,11 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ->method('setRecipient') ->with('recipient') ->will($this->returnValue($this->giftMessageMock)); + $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId); + $this->giftMessageMock->expects($this->once()) + ->method('setCustomerId') + ->with($customerId) + ->will($this->returnValue($this->giftMessageMock)); $this->giftMessageMock->expects($this->once()) ->method('setMessage') ->with('message') @@ -229,6 +238,7 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ], ], ]; + $customerId = 42; $this->messageFactoryMock->expects($this->once()) ->method('create') @@ -250,6 +260,11 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ->method('setMessage') ->with('message') ->will($this->returnValue($this->giftMessageMock)); + $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId); + $this->giftMessageMock->expects($this->once()) + ->method('setCustomerId') + ->with($customerId) + ->will($this->returnValue($this->giftMessageMock)); $this->giftMessageMock->expects($this->once())->method('save'); $this->giftMessageMock->expects($this->once())->method('getId')->will($this->returnValue(33)); $this->quoteAddressMock->expects($this->once()) @@ -273,6 +288,7 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ], ], ]; + $customerId = 42; $this->messageFactoryMock->expects($this->once()) ->method('create') @@ -298,6 +314,11 @@ class GiftMessageManagerTest extends \PHPUnit_Framework_TestCase ->method('setMessage') ->with('message') ->will($this->returnValue($this->giftMessageMock)); + $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn($customerId); + $this->giftMessageMock->expects($this->once()) + ->method('setCustomerId') + ->with($customerId) + ->will($this->returnValue($this->giftMessageMock)); $this->giftMessageMock->expects($this->once())->method('save'); $this->giftMessageMock->expects($this->once())->method('getId')->will($this->returnValue(33)); $this->quoteAddressItemMock->expects($this->once()) diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/ObserverTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/ObserverTest.php new file mode 100644 index 0000000000000000000000000000000000000000..cf2fb943d417fb05c4a630e282ab7e716ad51279 --- /dev/null +++ b/app/code/Magento/GiftMessage/Test/Unit/Model/ObserverTest.php @@ -0,0 +1,52 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +namespace Magento\GiftMessage\Test\Unit\Model; + +class ObserverTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\GiftMessage\Model\Observer + */ + protected $model; + + protected function setUp() + { + $giftMessageFactoryMock = $this->getMock('\Magento\GiftMessage\Model\MessageFactory', [], [], '', false); + $giftMessageMock = $this->getMock('\Magento\GiftMessage\Helper\Message', [], [], '', false); + $this->model = new \Magento\GiftMessage\Model\Observer($giftMessageFactoryMock, $giftMessageMock); + } + + public function testMultishippingEventCreateOrders() + { + $giftMessageId = 42; + $observerMock = $this->getMock('\Magento\Framework\Event\Observer'); + $eventMock = $this->getMock('\Magento\Framework\Event', ['getOrder', 'getAddress']); + $addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', ['getGiftMessageId'], [], '', false); + $orderMock = $this->getMock('\Magento\Sales\Model\Order', ['setGiftMessageId'], [], '', false); + $observerMock->expects($this->exactly(2))->method('getEvent')->willReturn($eventMock); + $eventMock->expects($this->once())->method('getAddress')->willReturn($addressMock); + $addressMock->expects($this->once())->method('getGiftMessageId')->willReturn($giftMessageId); + $eventMock->expects($this->once())->method('getOrder')->willReturn($orderMock); + $orderMock->expects($this->once())->method('setGiftMessageId')->with($giftMessageId); + $this->assertEquals($this->model, $this->model->multishippingEventCreateOrders($observerMock)); + } + + public function testSalesEventQuoteSubmitBefore() + { + $giftMessageId = 42; + $observerMock = $this->getMock('\Magento\Framework\Event\Observer'); + $eventMock = $this->getMock('\Magento\Framework\Event', ['getOrder', 'getQuote']); + $quoteMock = $this->getMock('\Magento\Quote\Model\Quote', ['getGiftMessageId'], [], '', false); + $orderMock = $this->getMock('\Magento\Sales\Model\Order', ['setGiftMessageId'], [], '', false); + $observerMock->expects($this->exactly(2))->method('getEvent')->willReturn($eventMock); + $eventMock->expects($this->once())->method('getQuote')->willReturn($quoteMock); + $quoteMock->expects($this->once())->method('getGiftMessageId')->willReturn($giftMessageId); + $eventMock->expects($this->once())->method('getOrder')->willReturn($orderMock); + $orderMock->expects($this->once())->method('setGiftMessageId')->with($giftMessageId); + $this->assertEquals($this->model, $this->model->salesEventQuoteSubmitBefore($observerMock)); + } +} diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 7ac901516db7fa57e51ee6c1b89bd5a75868b18d..cdc15af4279b4934754adee08f63e97497cdec0e 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-multishipping": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-multishipping": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-core": "0.42.0-beta10" + "magento/module-core": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GiftMessage/etc/adminhtml/events.xml b/app/code/Magento/GiftMessage/etc/adminhtml/events.xml index 68ce9ea43da8b8b82ce7a8ed2fdca3689b40f32e..0332fc0e59044672cbf075d62dc922b74bfe745a 100644 --- a/app/code/Magento/GiftMessage/etc/adminhtml/events.xml +++ b/app/code/Magento/GiftMessage/etc/adminhtml/events.xml @@ -6,8 +6,8 @@ */ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd"> - <event name="sales_convert_quote_to_order"> - <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventConvertQuoteToOrder" shared="false" /> + <event name="sales_model_service_quote_submit_before"> + <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventQuoteSubmitBefore" shared="false" /> </event> <event name="adminhtml_sales_order_create_create_order"> <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="checkoutEventCreateOrder" shared="false" /> diff --git a/app/code/Magento/GiftMessage/etc/frontend/events.xml b/app/code/Magento/GiftMessage/etc/frontend/events.xml index bceffb520f1a58ac23051b986126e1e3aa6fe9f6..d439bfcbcd29eef354cf45eee1f6de35750a30b6 100644 --- a/app/code/Magento/GiftMessage/etc/frontend/events.xml +++ b/app/code/Magento/GiftMessage/etc/frontend/events.xml @@ -6,10 +6,13 @@ */ --> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd"> - <event name="sales_convert_quote_to_order"> - <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventConvertQuoteToOrder" shared="false" /> + <event name="sales_model_service_quote_submit_before"> + <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventQuoteSubmitBefore" shared="false" /> </event> <event name="sales_convert_order_to_quote"> <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="salesEventOrderToQuote" shared="false" /> </event> + <event name="checkout_type_multishipping_create_orders_single"> + <observer name="giftmessage" instance="Magento\GiftMessage\Model\Observer" method="multishippingEventCreateOrders" shared="false" /> + </event> </config> diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 8d8ce1210d6e00e00981f7be0e8c7dcfb290871e..26d64df002ac0cb033536d6d4a34405ad24a2160 100644 --- a/app/code/Magento/GoogleAdwords/composer.json +++ b/app/code/Magento/GoogleAdwords/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 08259fbf0bc6967741f12bb556baee7b4fbd9a35..3891893165ee1636f560dc84798d312323a3aae3 100644 --- a/app/code/Magento/GoogleAnalytics/composer.json +++ b/app/code/Magento/GoogleAnalytics/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-cookie": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-cookie": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index 86affa915f3ef35c12e15d20b38ebd2606ea1859..d2a1b785709773c230e05a27869321d6daeec8c8 100644 --- a/app/code/Magento/GoogleOptimizer/composer.json +++ b/app/code/Magento/GoogleOptimizer/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-google-analytics": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-google-analytics": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index a351ab6529e403973506a9845ea54626c52f1562..fdf25142814a5a9ad5a9024dc353b862885674c8 100644 --- a/app/code/Magento/GoogleShopping/composer.json +++ b/app/code/Magento/GoogleShopping/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 3ef98710bd22bec1c3ad31e7124eeea590126cdf..b260194c32c4a107dc06e237a66b3cf0852fb696 100644 --- a/app/code/Magento/GroupedImportExport/composer.json +++ b/app/code/Magento/GroupedImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-import-export": "0.42.0-beta10", - "magento/module-catalog-import-export": "0.42.0-beta10", - "magento/module-grouped-product": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-import-export": "0.42.0-beta11", + "magento/module-catalog-import-export": "0.42.0-beta11", + "magento/module-grouped-product": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index d83867df634d9058ef1acfab2b295c5122c7e15b..66be65aaa588bba8e18420a2d2bf973a27555ecd 100644 --- a/app/code/Magento/GroupedProduct/composer.json +++ b/app/code/Magento/GroupedProduct/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/module-msrp": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/module-msrp": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index fae726064c23cf80c1db0d9d394a9741f6b04e0a..910e6c723cf186716ac5069324d63cb8800f60c2 100644 --- a/app/code/Magento/ImportExport/composer.json +++ b/app/code/Magento/ImportExport/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-indexer": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-indexer": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 1962340b5f94d3f59bd58fc706f2b27eb8c80e71..f11f09d8331950e9a9068f1e2b082bd9034d94b7 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index 5fb055aa30ef2185340c8e2c197476b331dd9da0..72465a630aff983bc73eb2ab9053a79902b4652e 100644 --- a/app/code/Magento/Integration/composer.json +++ b/app/code/Magento/Integration/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-user": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-user": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 449150c3a3359644315f38fdb9a38226053d89bb..ed080fb84e1d4d63980ef1581cd6d78fd42c74d5 100644 --- a/app/code/Magento/LayeredNavigation/composer.json +++ b/app/code/Magento/LayeredNavigation/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index efabaf43e1f8d9033afe006387830e5221381cd2..ea86b5146ee38d3ff25628fee70ab424a47258de 100644 --- a/app/code/Magento/Log/composer.json +++ b/app/code/Magento/Log/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json index 4152dbad36b40ca8821399405ca44c666d144714..bfd1965a73ff2009fb06f04efa3d4d43a4620706 100644 --- a/app/code/Magento/MediaStorage/composer.json +++ b/app/code/Magento/MediaStorage/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index e4e2b8f4b789028268a84c64a435e693de36c011..1202688cb167fa8727bb7d384c12ab4c3307ec11 100644 --- a/app/code/Magento/Msrp/composer.json +++ b/app/code/Magento/Msrp/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-bundle": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-downloadable": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-grouped-product": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-bundle": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-downloadable": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-grouped-product": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 720a84a4453b97b0f3e42b27178dd8fb3f72e146..fb450ad1bb22b553d05a1a25f15b75d9c31805b9 100644 --- a/app/code/Magento/Multishipping/composer.json +++ b/app/code/Magento/Multishipping/composer.json @@ -3,19 +3,19 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index 7495b0f0f256d81c2e85b859194b45e445881e80..53c62793ddf40a1c9e4bf44cd7337543382fcfba 100644 --- a/app/code/Magento/Newsletter/composer.json +++ b/app/code/Magento/Newsletter/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-email": "0.42.0-beta10", - "magento/module-cron": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-require-js": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-email": "0.42.0-beta11", + "magento/module-cron": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-require-js": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 1915ae31b13c990579464ac4fb096e102615a45f..a0a478d5a64a0dcd7eaf19ac75ebd453fa518abe 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-payment": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-payment": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 44ede1457524a535b6f49fdfb3f8499057ceeaa7..4ee66ff206e4409ba571eb0acb02c1ec6da28caf 100644 --- a/app/code/Magento/OfflineShipping/composer.json +++ b/app/code/Magento/OfflineShipping/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-sales-rule": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-sales-rule": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index b9859c494900f6546a77cb428b912c871d3e29fb..b0cd589086158448b674bb60c2e7ecae4ed14959 100644 --- a/app/code/Magento/PageCache/composer.json +++ b/app/code/Magento/PageCache/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index c33d23eb7b01377b73a4cf9f101e6aad7d6e6741..70a4a9d5af4b13076668fe3c222c99ae589850cd 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-centinel": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-centinel": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index 39f16faa0040495ca77c019f6d017d19ed90dae4..b09e1e6d7eec9a649f3e9e4f1a69bc5d773dd4ab 100644 --- a/app/code/Magento/Persistent/composer.json +++ b/app/code/Magento/Persistent/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-cron": "0.42.0-beta10", - "magento/module-page-cache": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-cron": "0.42.0-beta11", + "magento/module-page-cache": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index c17f984c4d050abcf9f2b206e3402c50d7a5c564..1e456b79f57b23b5b2356e8fc24ac8b82dd0a03f 100644 --- a/app/code/Magento/ProductAlert/composer.json +++ b/app/code/Magento/ProductAlert/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Quote/Model/QueryResolver.php b/app/code/Magento/Quote/Model/QueryResolver.php new file mode 100644 index 0000000000000000000000000000000000000000..e1c14fe743f4fd3c2e688cdc18d9d68cedd1875e --- /dev/null +++ b/app/code/Magento/Quote/Model/QueryResolver.php @@ -0,0 +1,95 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +namespace Magento\Quote\Model; + +use Magento\Framework\Config\CacheInterface; +use Magento\Framework\App\Resource\ConfigInterface; + +class QueryResolver +{ + /** + * @var array + */ + private $data = []; + + /** + * @var ConfigInterface + */ + private $config; + + /** + * @var CacheInterface + */ + private $cache; + + /** + * @var string + */ + private $cacheId; + + /** + * Cache tags + * + * @var array + */ + private $cacheTags = []; + + /** + * @param ConfigInterface $config + * @param CacheInterface $cache + * @param string $cacheId + */ + public function __construct( + ConfigInterface $config, + CacheInterface $cache, + $cacheId = 'connection_config_cache' + ) { + $this->config = $config; + $this->cache = $cache; + $this->cacheId = $cacheId; + } + + /** + * Get flag value + * + * @return bool + */ + public function isSingleQuery() + { + if (!isset($this->data['checkout'])) { + $this->initData(); + } + return $this->data['checkout']; + } + + /** + * Initialise data for configuration + * @return void + */ + protected function initData() + { + $data = $this->cache->load($this->cacheId); + if (false === $data) { + $singleQuery = $this->config->getConnectionName('checkout_setup') == 'default' ? true : false; + $data['checkout'] = $singleQuery; + $this->cache->save(serialize($data), $this->cacheId, $this->cacheTags); + } else { + $data = unserialize($data); + } + $this->merge($data); + } + + /** + * Merge config data to the object + * + * @param array $config + * @return void + */ + public function merge(array $config) + { + $this->data = array_replace_recursive($this->data, $config); + } +} diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php index 337710338c960011dd1bee5d2c3587e01adb69cf..0f53de853e9c123685bab4ffaac707a6d55ce94d 100644 --- a/app/code/Magento/Quote/Model/QuoteManagement.php +++ b/app/code/Magento/Quote/Model/QuoteManagement.php @@ -236,8 +236,15 @@ class QuoteManagement implements \Magento\Quote\Api\CartManagementInterface public function placeOrder($cartId) { $quote = $this->quoteRepository->getActive($cartId); - $order = $this->submit($quote); - return $order->getId(); + + if ($quote->getCheckoutMethod() === 'guest') { + $quote->setCustomerId(null); + $quote->setCustomerEmail($quote->getBillingAddress()->getEmail()); + $quote->setCustomerIsGuest(true); + $quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID); + } + + return $this->submit($quote)->getId(); } /** diff --git a/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php b/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php new file mode 100644 index 0000000000000000000000000000000000000000..8aaaf69b1b5422b54f6964dd20cd21658fc32bd3 --- /dev/null +++ b/app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php @@ -0,0 +1,88 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ + +namespace Magento\Quote\Test\Unit\Model; + +class QueryResolverTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Quote\Model\QueryResolver + */ + protected $quoteResolver; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $configMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $cacheMock; + + protected function setUp() + { + $this->configMock = $this->getMock('Magento\Framework\App\Resource\ConfigInterface'); + $this->cacheMock = $this->getMock('Magento\Framework\Config\CacheInterface'); + $this->quoteResolver = new \Magento\Quote\Model\QueryResolver( + $this->configMock, + $this->cacheMock, + 'connection_config_cache' + ); + + } + + public function testIsSingleQueryWhenDataWereCached() + { + $queryData['checkout'] = true; + $this->cacheMock + ->expects($this->once()) + ->method('load') + ->with('connection_config_cache') + ->willReturn(serialize($queryData)); + $this->assertTrue($this->quoteResolver->isSingleQuery()); + } + + public function testIsSingleQueryWhenDataNotCached() + { + $queryData['checkout'] = true; + $this->cacheMock + ->expects($this->once()) + ->method('load') + ->with('connection_config_cache') + ->willReturn(false); + $this->configMock + ->expects($this->once()) + ->method('getConnectionName') + ->with('checkout_setup') + ->willReturn('default'); + $this->cacheMock + ->expects($this->once()) + ->method('save') + ->with(serialize($queryData), 'connection_config_cache', []); + $this->assertTrue($this->quoteResolver->isSingleQuery()); + } + + public function testIsSingleQueryWhenSeveralConnectionsExist() + { + $queryData['checkout'] = false; + $this->cacheMock + ->expects($this->once()) + ->method('load') + ->with('connection_config_cache') + ->willReturn(false); + $this->configMock + ->expects($this->once()) + ->method('getConnectionName') + ->with('checkout_setup') + ->willReturn('checkout'); + $this->cacheMock + ->expects($this->once()) + ->method('save') + ->with(serialize($queryData), 'connection_config_cache', []); + $this->assertFalse($this->quoteResolver->isSingleQuery()); + } +} diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php index 91acfc6402af36e51806cfeba16b92329cfc2a38..522734a324ad98bc080654f4ceaee3e3a6da295e 100644 --- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php +++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php @@ -579,6 +579,62 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase $this->assertEquals($order, $this->model->submit($quote, $orderData)); } + /** + * //Last method throws exception because class method 'submit()' already covered. + * + * @expectedException \Exception + * @expectedExceptionMessage Quote prepared for guest customer. + */ + public function testPlaceOrderIfCustomerIsQuest() + { + $cartId = 100; + $email = 'email@mail.com'; + $quoteMock = $this->getMock( + 'Magento\Quote\Model\Quote', + [ + 'getCheckoutMethod', + 'setCustomerId', + 'setCustomerEmail', + 'getBillingAddress', + 'setCustomerIsGuest', + 'setCustomerGroupId' + ], + [], + '', + false + ); + $this->quoteRepositoryMock->expects($this->once())->method('getActive')->with($cartId)->willReturn($quoteMock); + + $quoteMock->expects($this->once()) + ->method('getCheckoutMethod') + ->willReturn(\Magento\Checkout\Model\Type\Onepage::METHOD_GUEST); + $quoteMock->expects($this->once())->method('setCustomerId')->with(null)->willReturnSelf(); + $quoteMock->expects($this->once())->method('setCustomerEmail')->with($email)->willReturnSelf(); + + $addressMock = $this->getMock('\Magento\Quote\Model\Quote\Address', ['getEmail'], [], '', false); + $addressMock->expects($this->once())->method('getEmail')->willReturn($email); + $quoteMock->expects($this->once())->method('getBillingAddress')->with()->willReturn($addressMock); + + $quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(true)->willReturnSelf(); + $quoteMock->expects($this->once()) + ->method('setCustomerGroupId') + ->with(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID) + ->willThrowException(new \Exception('Quote prepared for guest customer.')); + + $this->model->placeOrder($cartId); + } + + /** + * @param $isGuest + * @param $isVirtual + * @param Quote\Address $billingAddress + * @param Quote\Payment $payment + * @param $customerId + * @param $id + * @param array $quoteItems + * @param Quote\Address $shippingAddress + * @return \PHPUnit_Framework_MockObject_MockObject + */ protected function getQuote( $isGuest, $isVirtual, @@ -652,6 +708,16 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase return $quote; } + /** + * @param \Magento\Sales\Api\Data\OrderInterface $baseOrder + * @param \Magento\Sales\Api\Data\OrderAddressInterface $billingAddress + * @param array $addresses + * @param array $payments + * @param array $items + * @param $quoteId + * @param \Magento\Sales\Api\Data\OrderAddressInterface $shippingAddress + * @return \PHPUnit_Framework_MockObject_MockObject + */ protected function prepareOrderFactory( \Magento\Sales\Api\Data\OrderInterface $baseOrder, \Magento\Sales\Api\Data\OrderAddressInterface $billingAddress, @@ -659,7 +725,8 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase array $payments, array $items, $quoteId, - \Magento\Sales\Api\Data\OrderAddressInterface $shippingAddress = null + \Magento\Sales\Api\Data\OrderAddressInterface $shippingAddress = null, + $customerId = null ) { $order = $this->getMock( 'Magento\Sales\Model\Order', @@ -680,6 +747,11 @@ class QuoteManagementTest extends \PHPUnit_Framework_TestCase if ($shippingAddress) { $order->expects($this->once())->method('setShippingAddress')->with($shippingAddress); } + if ($customerId) { + $this->orderFactory->expects($this->once()) + ->method('setCustomerId') + ->with($customerId); + } $order->expects($this->any())->method('getAddressesCollection'); $order->expects($this->any())->method('getAddresses'); $order->expects($this->any())->method('getBillingAddress')->willReturn(false); diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json index 2ac820a6c16bf6ec6ab855c3e74313149d8a3300..9bc1150e18b91d45761812d46b1cee3690428a46 100644 --- a/app/code/Magento/Quote/composer.json +++ b/app/code/Magento/Quote/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-catalog-rule": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-catalog-rule": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php index 4ef5903836cc0b82e097b768f1f59f7ec672cd6a..d40166dff4bb52049017b1340ce7cfd9c35de069 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php @@ -64,7 +64,9 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart } $this->setCollection($collection); - return parent::_prepareCollection(); + parent::_prepareCollection(); + $this->getCollection()->resolveCustomerNames(); + return $this; } /** diff --git a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php index a4837b8f21861bff88ee59dd564d207c4eab75a5..6de66a60e04a8c28d281e4f55f1fb0cca6a388dc 100644 --- a/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php +++ b/app/code/Magento/Reports/Block/Adminhtml/Shopcart/Product/Grid.php @@ -18,19 +18,27 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart */ protected $_quotesFactory; + /** + * @var \Magento\Quote\Model\QueryResolver + */ + protected $queryResolver; + /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Backend\Helper\Data $backendHelper - * @param \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory + * @param \Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface $quotesFactory + * @param \Magento\Quote\Model\QueryResolver $queryResolver * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Backend\Helper\Data $backendHelper, - \Magento\Reports\Model\Resource\Quote\CollectionFactory $quotesFactory, + \Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface $quotesFactory, + \Magento\Quote\Model\QueryResolver $queryResolver, array $data = [] ) { $this->_quotesFactory = $quotesFactory; + $this->queryResolver = $queryResolver; parent::__construct($context, $backendHelper, $data); } @@ -48,11 +56,15 @@ class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart */ protected function _prepareCollection() { - /** @var $collection \Magento\Reports\Model\Resource\Quote\Collection */ $collection = $this->_quotesFactory->create(); - $collection->prepareForProductsInCarts()->setSelectCountSqlType( - \Magento\Reports\Model\Resource\Quote\Collection::SELECT_COUNT_SQL_TYPE_CART - ); + if ($this->queryResolver->isSingleQuery()) { + $collection->prepareForProductsInCarts(); + $collection->setSelectCountSqlType( + \Magento\Reports\Model\Resource\Quote\Collection::SELECT_COUNT_SQL_TYPE_CART + ); + } else { + $collection->prepareActiveCartItems(); + } $this->setCollection($collection); return parent::_prepareCollection(); } diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php index 0462d4d727f8e127b1b36f2501b6ee9a8b2ead59..3e77d75e16eb6f2f451477f1c89ceb4f907b4e8e 100644 --- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php +++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php @@ -33,11 +33,11 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection protected $_productEntityTableName; /** - * Product entity type identifier + * Product entity attribute set identifier * * @var int */ - protected $_productEntityTypeId; + protected $_productEntityAttributeSetId; /** * Select count @@ -110,7 +110,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection ) { $this->setProductEntityId($product->getEntityIdField()); $this->setProductEntityTableName($product->getEntityTable()); - $this->setProductEntityTypeId($product->getTypeId()); + $this->setProductAttributeSetId($product->getEntityType()->getDefaultAttributeSetId()); parent::__construct( $entityFactory, $logger, @@ -140,6 +140,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection /** * Set Type for COUNT SQL Select * + * @codeCoverageIgnoreStart * @param int $type * @return $this */ @@ -194,26 +195,27 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection } /** - * Set product entity type id + * Get product attribute set id * - * @param int $value - * @return $this + * @return int */ - public function setProductEntityTypeId($value) + public function getProductAttributeSetId() { - $this->_productEntityTypeId = $value; - return $this; + return $this->_productEntityAttributeSetId; } /** - * Get product entity type id + * Set product attribute set id * - * @return int + * @param int $value + * @return $this */ - public function getProductEntityTypeId() + public function setProductAttributeSetId($value) { - return $this->_productEntityTypeId; + $this->_productEntityAttributeSetId = $value; + return $this; } + //@codeCoverageIgnoreEnd /** * Join fields @@ -232,7 +234,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection /** * Get select count sql * - * @return string + * @return \Zend_Db_Select */ public function getSelectCountSql() { @@ -261,39 +263,6 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection return $countSelect; } - /** - * Add carts count - * - * @return $this - */ - public function addCartsCount() - { - $countSelect = clone $this->getSelect(); - $countSelect->reset(); - - $countSelect->from( - ['quote_items' => $this->getTable('quote_item')], - 'COUNT(*)' - )->join( - ['quotes' => $this->getTable('quote')], - 'quotes.entity_id = quote_items.quote_id AND quotes.is_active = 1', - [] - )->where( - "quote_items.product_id = e.entity_id" - ); - - $this->getSelect()->columns( - ["carts" => "({$countSelect})"] - )->group( - "e.{$this->getProductEntityId()}" - )->having( - 'carts > ?', - 0 - ); - - return $this; - } - /** * Add orders count * @@ -351,7 +320,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection $productJoinCondition = [ $adapter->quoteInto('(e.type_id NOT IN (?))', $compositeTypeIds), 'e.entity_id = order_items.product_id', - $adapter->quoteInto('e.entity_type_id = ?', $this->getProductEntityTypeId()), + $adapter->quoteInto('e.attribute_set_id = ?', $this->getProductAttributeSetId()), ]; if ($from != '' && $to != '') { @@ -371,7 +340,6 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection implode(' AND ', $productJoinCondition), [ 'entity_id' => 'order_items.product_id', - 'entity_type_id' => 'e.entity_type_id', 'attribute_set_id' => 'e.attribute_set_id', 'type_id' => 'e.type_id', 'sku' => 'e.sku', @@ -434,7 +402,10 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection ['views' => 'COUNT(report_table_views.event_id)'] )->join( ['e' => $this->getProductEntityTableName()], - 'e.entity_id = report_table_views.object_id' + $this->getConnection()->quoteInto( + 'e.entity_id = report_table_views.object_id AND e.attribute_set_id = ?', + $this->getProductAttributeSetId() + ) )->where( 'report_table_views.event_type_id = ?', $productViewEvent diff --git a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php index a2deabc2d008f4b33a05597ede7ac9421c79c660..38ba00038520a828469d8d5c1cda8976c9a3b0b3 100644 --- a/app/code/Magento/Reports/Model/Resource/Quote/Collection.php +++ b/app/code/Magento/Reports/Model/Resource/Quote/Collection.php @@ -98,14 +98,18 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection )->addFieldToFilter( 'main_table.is_active', '1' + )->addFieldToFilter( + 'main_table.customer_id', + ['neq' => null] )->addSubtotal( $storeIds, $filter - )->addCustomerData( - $filter )->setOrder( 'updated_at' ); + if (isset($filter['email']) || isset($filter['customer_name'])) { + $this->addCustomerData($filter); + } if (is_array($storeIds) && !empty($storeIds)) { $this->addFieldToFilter('store_id', ['in' => $storeIds]); } @@ -127,14 +131,6 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection $productAttrPriceId = (int)$productAttrPrice->getAttributeId(); $productAttrPriceTable = $productAttrPrice->getBackend()->getTable(); - $ordersSubSelect = clone $this->getSelect(); - $ordersSubSelect->reset()->from( - ['oi' => $this->getTable('sales_order_item')], - ['orders' => new \Zend_Db_Expr('COUNT(1)'), 'product_id'] - )->group( - 'oi.product_id' - ); - $this->getSelect()->useStraightJoin( true )->reset( @@ -149,15 +145,16 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection null )->joinInner( ['product_name' => $productAttrNameTable], - "product_name.entity_id = e.entity_id\n AND product_name.attribute_id = {$productAttrNameId}\n AND product_name.store_id = " . - \Magento\Store\Model\Store::DEFAULT_STORE_ID, + 'product_name.entity_id = e.entity_id' + . ' AND product_name.attribute_id = ' . $productAttrNameId + . ' AND product_name.store_id = ' . \Magento\Store\Model\Store::DEFAULT_STORE_ID, ['name' => 'product_name.value'] )->joinInner( ['product_price' => $productAttrPriceTable], "product_price.entity_id = e.entity_id AND product_price.attribute_id = {$productAttrPriceId}", ['price' => new \Zend_Db_Expr('product_price.value * main_table.base_to_global_rate')] )->joinLeft( - ['order_items' => new \Zend_Db_Expr(sprintf('(%s)', $ordersSubSelect))], + ['order_items' => new \Zend_Db_Expr(sprintf('(%s)', $this->getOrdersSubSelect()))], 'order_items.product_id = e.entity_id', [] )->columns( @@ -176,6 +173,24 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection return $this; } + /** + * Orders quantity subselect + * + * @return \Magento\Framework\DB\Select + */ + protected function getOrdersSubSelect() + { + $ordersSubSelect = clone $this->getSelect(); + $ordersSubSelect->reset()->from( + ['oi' => $this->getTable('sales_order_item')], + ['orders' => new \Zend_Db_Expr('COUNT(1)'), 'product_id'] + )->group( + 'oi.product_id' + ); + + return $ordersSubSelect; + } + /** * Add store ids to filter * @@ -191,64 +206,25 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection /** * Add customer data * - * @param unknown_type $filter + * @param array|null $filter * @return $this */ public function addCustomerData($filter = null) { - $attrFirstname = $this->_customerResource->getAttribute('firstname'); - $attrFirstnameId = (int)$attrFirstname->getAttributeId(); - $attrFirstnameTableName = $attrFirstname->getBackend()->getTable(); - - $attrLastname = $this->_customerResource->getAttribute('lastname'); - $attrLastnameId = (int)$attrLastname->getAttributeId(); - $attrLastnameTableName = $attrLastname->getBackend()->getTable(); - - $attrEmail = $this->_customerResource->getAttribute('email'); - $attrEmailTableName = $attrEmail->getBackend()->getTable(); - - $adapter = $this->getSelect()->getAdapter(); - $customerName = $adapter->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' '); - $this->getSelect()->joinInner( - ['cust_email' => $attrEmailTableName], - 'cust_email.entity_id = main_table.customer_id', - ['email' => 'cust_email.email'] - )->joinInner( - ['cust_fname' => $attrFirstnameTableName], - implode( - ' AND ', - [ - 'cust_fname.entity_id = main_table.customer_id', - $adapter->quoteInto('cust_fname.attribute_id = ?', (int)$attrFirstnameId) - ] - ), - ['firstname' => 'cust_fname.value'] - )->joinInner( - ['cust_lname' => $attrLastnameTableName], - implode( - ' AND ', - [ - 'cust_lname.entity_id = main_table.customer_id', - $adapter->quoteInto('cust_lname.attribute_id = ?', (int)$attrLastnameId) - ] - ), - ['lastname' => 'cust_lname.value', 'customer_name' => $customerName] - ); - - $this->_joinedFields['customer_name'] = $customerName; - $this->_joinedFields['email'] = 'cust_email.email'; - - if ($filter) { - if (isset($filter['customer_name'])) { - $likeExpr = '%' . $filter['customer_name'] . '%'; - $this->getSelect()->where($this->_joinedFields['customer_name'] . ' LIKE ?', $likeExpr); - } - if (isset($filter['email'])) { - $likeExpr = '%' . $filter['email'] . '%'; - $this->getSelect()->where($this->_joinedFields['email'] . ' LIKE ?', $likeExpr); - } + $customersSelect = $this->_customerResource->getReadConnection()->select(); + $customersSelect->from(['customer' => 'customer_entity'], 'entity_id'); + if (isset($filter['customer_name'])) { + $customersSelect = $this->getCustomerNames($customersSelect); + $customerName = $customersSelect->getAdapter()->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' '); + $customersSelect->where( + $customerName . ' LIKE ?', '%' . $filter['customer_name'] . '%' + ); } - + if (isset($filter['email'])) { + $customersSelect->where('customer.email LIKE ?', '%' . $filter['email'] . '%'); + } + $filteredCustomers = $this->_customerResource->getReadConnection()->fetchCol($customersSelect); + $this->getSelect()->where('main_table.customer_id IN (?)', $filteredCustomers); return $this; } @@ -314,4 +290,57 @@ class Collection extends \Magento\Quote\Model\Resource\Quote\Collection return $countSelect; } + + /** + * @param \Magento\Framework\DB\Select $select + * @return \Magento\Framework\DB\Select + */ + protected function getCustomerNames($select) + { + $attrFirstname = $this->_customerResource->getAttribute('firstname'); + $attrFirstnameId = (int)$attrFirstname->getAttributeId(); + $attrFirstnameTableName = $attrFirstname->getBackend()->getTable(); + $attrLastname = $this->_customerResource->getAttribute('lastname'); + $attrLastnameId = (int)$attrLastname->getAttributeId(); + $attrLastnameTableName = $attrLastname->getBackend()->getTable(); + $select->joinInner( + ['cust_fname' => $attrFirstnameTableName], + 'customer.entity_id = cust_fname.entity_id', + ['firstname' => 'cust_fname.value'] + )->joinInner( + ['cust_lname' => $attrLastnameTableName], + 'customer.entity_id = cust_lname.entity_id', + ['lastname' => 'cust_lname.value'] + )->where( + 'cust_fname.attribute_id = ?', (int)$attrFirstnameId + )->where( + 'cust_lname.attribute_id = ?', (int)$attrLastnameId + ); + return $select; + } + + /** + * Resolve customers data based on ids quote table. + * + * @return void + */ + public function resolveCustomerNames() + { + $select = $this->_customerResource->getReadConnection()->select(); + $customerName = $select->getAdapter()->getConcatSql(['cust_fname.value', 'cust_lname.value'], ' '); + + $select->from( + ['customer' => 'customer_entity'] + )->columns( + ['customer_name' => $customerName] + )->where( + 'customer.entity_id IN (?)', array_column($this->getData(), 'customer_id') + ); + $customersData = $select->getAdapter()->fetchAll($this->getCustomerNames($select)); + + foreach($this->getItems() as $item) { + $item->setData(array_merge($item->getData(), current($customersData))); + next($customersData); + } + } } diff --git a/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactory.php b/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactory.php new file mode 100644 index 0000000000000000000000000000000000000000..c08c6e1dd00759b85bf56409a58890d5a9539626 --- /dev/null +++ b/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactory.php @@ -0,0 +1,50 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +namespace Magento\Reports\Model\Resource\Quote; + +/** + * Factory class for @see \Magento\Reports\Model\Resource\Quote\Collection + * + * @codeCoverageIgnore + */ +class CollectionFactory implements \Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface +{ + /** + * Object Manager instance + * + * @var \Magento\Framework\ObjectManagerInterface + */ + protected $_objectManager = null; + + /** + * Instance name to create + * + * @var string + */ + protected $_instanceName = null; + + /** + * Factory constructor + * + * @param \Magento\Framework\ObjectManagerInterface $objectManager + * @param string $instanceName + */ + public function __construct( + \Magento\Framework\ObjectManagerInterface $objectManager, + $instanceName = 'Magento\\Reports\\Model\\Resource\\Quote\\Collection' + ) { + $this->_objectManager = $objectManager; + $this->_instanceName = $instanceName; + } + + /** + *{ @inheritdoc) + */ + public function create(array $data = []) + { + return $this->_objectManager->create($this->_instanceName, $data); + } +} diff --git a/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactoryInterface.php b/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactoryInterface.php new file mode 100644 index 0000000000000000000000000000000000000000..0d3a368ebe5f64c54e602c62b5f7aa8ae755a6c9 --- /dev/null +++ b/app/code/Magento/Reports/Model/Resource/Quote/CollectionFactoryInterface.php @@ -0,0 +1,17 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +namespace Magento\Reports\Model\Resource\Quote; + +interface CollectionFactoryInterface +{ + /** + * Create class instance with specified parameters + * + * @param array $data + * @return \Magento\Reports\Model\Resource\Quote\Collection + */ + public function create(array $data = []); +} diff --git a/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php deleted file mode 100644 index 8c251de78d6bd554fe73729dcef77b779fcd000d..0000000000000000000000000000000000000000 --- a/app/code/Magento/Reports/Model/Resource/Shopcart/Product/Collection.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Copyright © 2015 Magento. All rights reserved. - * See COPYING.txt for license details. - */ - -/** - * Shopingcart Products Report collection - * - * @author Magento Core Team <core@magentocommerce.com> - */ -namespace Magento\Reports\Model\Resource\Shopcart\Product; - -class Collection extends \Magento\Reports\Model\Resource\Product\Collection -{ - /** - * Join fields - * - * @return $this - */ - protected function _joinFields() - { - parent::_joinFields(); - $this->addAttributeToSelect('price')->addCartsCount()->addOrdersCount(); - - return $this; - } - - /** - * Set date range - * - * @param string $from - * @param string $to - * @return $this - * @SuppressWarnings(PHPMD.UnusedFormalParameter) - */ - public function setDateRange($from, $to) - { - $this->getSelect()->reset(); - return $this; - } -} diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index c8eac8fb48a9b8ff020052bca6094e786e2eef5b..1292a424044d2e91517b7831717a5675abac4228 100644 --- a/app/code/Magento/Reports/composer.json +++ b/app/code/Magento/Reports/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-log": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-review": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-downloadable": "0.42.0-beta10", - "magento/module-sales-rule": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-log": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-review": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-downloadable": "0.42.0-beta11", + "magento/module-sales-rule": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Reports/etc/di.xml b/app/code/Magento/Reports/etc/di.xml index dee2319661d6822fa08865b4afafdd45bd38ce6c..0e7a4e0a11b075e1265c9fd5f503b53105b249c6 100644 --- a/app/code/Magento/Reports/etc/di.xml +++ b/app/code/Magento/Reports/etc/di.xml @@ -29,4 +29,5 @@ <argument name="modulePrefix" xsi:type="string">reports</argument> </arguments> </type> + <preference for="Magento\Reports\Model\Resource\Quote\CollectionFactoryInterface" type="Magento\Reports\Model\Resource\Quote\CollectionFactory"/> </config> diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index a97770119f3ced2d09a2b2ee366c65eca3b33e21..59c62378ebb104a16e2aa878a789eb4de35fbeba 100644 --- a/app/code/Magento/RequireJs/composer.json +++ b/app/code/Magento/RequireJs/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index e067a98f1df6ee26d035e15d473c13186dde7865..8f961213f7b34a0da431534a402c1b818d09a957 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-newsletter": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-newsletter": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10" + "magento/module-cookie": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index ea7b4943177d33d10a74dfd226e6b22eb7f1ed9e..d69a3857b7bdba6599ee06ec74351de028f6b779 100644 --- a/app/code/Magento/Rss/composer.json +++ b/app/code/Magento/Rss/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index bb809a357c246d1aa3bc0f65b6c93b8df37bb47e..4f9861088d42dec7d27ebaed53058b9948c2c4f5 100644 --- a/app/code/Magento/Rule/composer.json +++ b/app/code/Magento/Rule/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index 0761689f8805d2abee1c3af48407aa04abc9eb87..465eb57a56a4b961e16b9fdd415b4b6365bf7339 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -3,34 +3,34 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-sales-rule": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-gift-message": "0.42.0-beta10", - "magento/module-reports": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-wishlist": "0.42.0-beta10", - "magento/module-email": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-sales-rule": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-gift-message": "0.42.0-beta11", + "magento/module-reports": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-wishlist": "0.42.0-beta11", + "magento/module-email": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index 7459ea37ee752bf4e82a632c3c5b70352435c1c2..0ffa29cf56722aab51fffb2e2809d2e8af908eb2 100644 --- a/app/code/Magento/SalesRule/composer.json +++ b/app/code/Magento/SalesRule/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-rule": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-reports": "0.42.0-beta10", - "magento/module-catalog-rule": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-rule": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-reports": "0.42.0-beta11", + "magento/module-catalog-rule": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index b4b8e496d4388b16884f3dbf7803bb9415e4ad4b..86fa6587ca018261a4b044ace8c47f182d7b1cd8 100644 --- a/app/code/Magento/Search/composer.json +++ b/app/code/Magento/Search/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog-search": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-reports": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog-search": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-reports": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json index ac8538bf1f2df812f8487fd3ae5deaac7b6e8cf1..d21e58d9379cc82c66c8aedf50fe91b493192c65 100644 --- a/app/code/Magento/Sendfriend/composer.json +++ b/app/code/Magento/Sendfriend/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index a6f1c05e38093046448cccfa9818a51888bfb53f..66635a57e11490fdb313c17fdb36376181e5787f 100644 --- a/app/code/Magento/Shipping/composer.json +++ b/app/code/Magento/Shipping/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-contact": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-payment": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-contact": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-payment": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "ext-gd": "*", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-fedex": "0.42.0-beta10", - "magento/module-ups": "0.42.0-beta10" + "magento/module-fedex": "0.42.0-beta11", + "magento/module-ups": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index d11ab5dd7e595081261d6e622d9f9756e9b00857..fbbf4562d2ee614b21f2746865145e0133155cdf 100644 --- a/app/code/Magento/Sitemap/composer.json +++ b/app/code/Magento/Sitemap/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog-url-rewrite": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog-url-rewrite": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index dcf234d70129613df9dca803f23582856d570e3a..aa9c2858d0b9d68e6243ec931d9593187061dca7 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-core": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-core": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index df6f7c0a526f29b7dea30feccc8f16e709ba1d03..941aaa559321007cdeb08ced1ca2ad7854b5c10b 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-reports": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-config": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-reports": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 1088c93cfcb01d60b9a55c0a615118c005665c88..73cee1c7822a2a2a9bb68c783313e0436eec3188 100644 --- a/app/code/Magento/TaxImportExport/composer.json +++ b/app/code/Magento/TaxImportExport/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-tax": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-tax": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index bb3a13d8643083a44e11ee316ea772737199bb2a..f6aaacab3492dca03a1a3b2aea9bd125a7e21437 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -3,24 +3,24 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-widget": "0.42.0-beta10", - "magento/module-config": "0.42.0-beta10", - "magento/module-media-storage": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-require-js": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-widget": "0.42.0-beta11", + "magento/module-config": "0.42.0-beta11", + "magento/module-media-storage": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-require-js": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-translation": "0.42.0-beta10" + "magento/module-translation": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 8b3c6cecf219351e1f7f79f5c9531675041163e1..8aa8d22d709a163f64f191c0a0f3a6e0fcc80938 100644 --- a/app/code/Magento/Translation/composer.json +++ b/app/code/Magento/Translation/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-backend": "0.42.0-beta10", - "magento/module-developer": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta11", + "magento/module-developer": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index 2275e5fb09fddbcffdb1b62dc153a4c08c480e06..60a6ded8ec6e28d38070c33d7bf71531b3e310e9 100644 --- a/app/code/Magento/Ui/composer.json +++ b/app/code/Magento/Ui/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index efef74da6772309d840ad89639d3a9ff93672573..1e20507397b78fe31ab080f62960d85d064aa0b3 100644 --- a/app/code/Magento/Ups/composer.json +++ b/app/code/Magento/Ups/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index c48c53af0893454336424db5acc8ddff69bf47c5..d19f73d7c5f28a6076bbed9b094aa0bbc790fe7d 100644 --- a/app/code/Magento/UrlRewrite/composer.json +++ b/app/code/Magento/UrlRewrite/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog-url-rewrite": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-cms-url-rewrite": "0.42.0-beta10", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog-url-rewrite": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-cms-url-rewrite": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index 90bfaa5c672dcfbd441adfb80520d7be1a4c52ef..b8b8c082c03e2b723ec7e1b596ec2606cacdad6c 100644 --- a/app/code/Magento/User/composer.json +++ b/app/code/Magento/User/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-integration": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-integration": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index c453231fd736df9e335d627f0ca0dfba070e5427..be86d099ce9c69870617f49046995e24886cb319 100644 --- a/app/code/Magento/Usps/composer.json +++ b/app/code/Magento/Usps/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-shipping": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-core": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-shipping": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-core": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json index 867353d569aec75c68dbc55c2d25cb23409fa7e5..c848657430cf42d75dafbb323b7f74f08014e694 100644 --- a/app/code/Magento/Variable/composer.json +++ b/app/code/Magento/Variable/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.4.11|~5.5.0|~5.6.0", - "magento/module-backend": "0.42.0-beta10", - "magento/module-email": "0.42.0-beta10", - "magento/module-store": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-backend": "0.42.0-beta11", + "magento/module-email": "0.42.0-beta11", + "magento/module-store": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json index f71b0437af828f63d1376cf5fc9a937850871bea..54446a457a44db3bc812496b1de1885e3bb3fc63 100644 --- a/app/code/Magento/Version/composer.json +++ b/app/code/Magento/Version/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 896373961e33640d9aee5ac428ec404081a8a679..17d31417ad16d2641472039e26e30ee44d650469 100644 --- a/app/code/Magento/Webapi/composer.json +++ b/app/code/Magento/Webapi/composer.json @@ -3,18 +3,18 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-authorization": "0.42.0-beta10", - "magento/module-integration": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-authorization": "0.42.0-beta11", + "magento/module-integration": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-user": "0.42.0-beta10" + "magento/module-user": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index 43f69dae001ac23ac24c2497e6e8f2ebc39f699d..b68a250e2dc813a378e0c4f395ddaf8c3fc8f9af 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-tax": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-directory": "0.42.0-beta10", - "magento/module-eav": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-quote": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-tax": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-directory": "0.42.0-beta11", + "magento/module-eav": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-quote": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 04e37e05878a41a94965d17666e311b17852ad34..e2d2a842edd068dd2c92f4e42bfe93e8c691523c 100644 --- a/app/code/Magento/Widget/composer.json +++ b/app/code/Magento/Widget/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-cms": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-variable": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-cms": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-variable": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index 3d8938f671728b5def5e958eb3b3967b21d9615b..2c765b3762ba323cef4aaaebb924fd2a43965287 100644 --- a/app/code/Magento/Wishlist/composer.json +++ b/app/code/Magento/Wishlist/composer.json @@ -3,28 +3,28 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.42.0-beta10", - "magento/module-customer": "0.42.0-beta10", - "magento/module-catalog": "0.42.0-beta10", - "magento/module-checkout": "0.42.0-beta10", - "magento/module-theme": "0.42.0-beta10", - "magento/module-catalog-inventory": "0.42.0-beta10", - "magento/module-rss": "0.42.0-beta10", - "magento/module-backend": "0.42.0-beta10", - "magento/module-sales": "0.42.0-beta10", - "magento/module-grouped-product": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", - "magento/module-ui": "0.42.0-beta10", + "magento/module-store": "0.42.0-beta11", + "magento/module-customer": "0.42.0-beta11", + "magento/module-catalog": "0.42.0-beta11", + "magento/module-checkout": "0.42.0-beta11", + "magento/module-theme": "0.42.0-beta11", + "magento/module-catalog-inventory": "0.42.0-beta11", + "magento/module-rss": "0.42.0-beta11", + "magento/module-backend": "0.42.0-beta11", + "magento/module-sales": "0.42.0-beta11", + "magento/module-grouped-product": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", + "magento/module-ui": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-configurable-product": "0.42.0-beta10", - "magento/module-downloadable": "0.42.0-beta10", - "magento/module-bundle": "0.42.0-beta10", - "magento/module-cookie": "0.42.0-beta10" + "magento/module-configurable-product": "0.42.0-beta11", + "magento/module-downloadable": "0.42.0-beta11", + "magento/module-bundle": "0.42.0-beta11", + "magento/module-cookie": "0.42.0-beta11" }, "type": "magento2-module", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json index d8f6c2dafc493dd3d70eea262f5f629dd0de9735..cf75e20e5ac18b425bf1d15c4d2d3a3e11ba10a6 100644 --- a/app/design/adminhtml/Magento/backend/composer.json +++ b/app/design/adminhtml/Magento/backend/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json index dfc89fb63706492fd51c761aa48ccb1a9a9091b3..ccdc3da87013b1cf25caac771f5340cfe051b35c 100644 --- a/app/design/frontend/Magento/blank/composer.json +++ b/app/design/frontend/Magento/blank/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json index 0d53807e257c600629d1bf053044a7ea630e6bdc..8210d430f42df6cf719e7e3b3bc26235f1f721f7 100644 --- a/app/design/frontend/Magento/luma/composer.json +++ b/app/design/frontend/Magento/luma/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/theme-frontend-blank": "0.42.0-beta10", - "magento/framework": "0.42.0-beta10", + "magento/theme-frontend-blank": "0.42.0-beta11", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/etc/di.xml b/app/etc/di.xml index 608d233d3e7f0b5f7faf0623bacfaa9ec5db02ec..6b6b81fa43b0a42a4e9942a99ee43f1581bb252f 100755 --- a/app/etc/di.xml +++ b/app/etc/di.xml @@ -25,7 +25,7 @@ <preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" /> <preference for="Magento\Framework\View\Design\Theme\ResolverInterface" type="Magento\Theme\Model\Theme\Resolver" /> <preference for="Magento\Framework\View\ConfigInterface" type="Magento\Framework\View\Config" /> - <preference for="Magento\Framework\App\View\Asset\Bundle\ConfigInterface" type="\Magento\Framework\App\View\Asset\Bundle\Config" /> + <preference for="Magento\Framework\View\Asset\Bundle\ConfigInterface" type="\Magento\Framework\View\Asset\Bundle\Config" /> <preference for="Magento\Framework\Locale\ListsInterface" type="Magento\Framework\Locale\Lists" /> <preference for="Magento\Framework\Api\AttributeTypeResolverInterface" type="Magento\Framework\Reflection\AttributeTypeResolver" /> <type name="Magento\Store\Model\Store"> @@ -129,7 +129,6 @@ <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" /> <preference for="Magento\Framework\Api\SearchResultsInterface" type="Magento\Framework\Api\SearchResults" /> <preference for="Magento\Framework\Api\AttributeInterface" type="Magento\Framework\Api\AttributeValue" /> - <preference for="Magento\Framework\View\Asset\Bundle\ConfigInterface" type="Magento\Framework\View\Asset\Bundle\Config" /> <preference for="Magento\Framework\Model\Resource\Db\TransactionManagerInterface" type="Magento\Framework\Model\Resource\Db\TransactionManager" /> <type name="Magento\Framework\Model\Resource\Db\TransactionManager" shared="false" /> <type name="Magento\Framework\Logger\Handler\Base"> diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json index a27a79d885229e2d6457026f14514cf3adf39f6e..e531a741d5ba2686b71cb3db8d6a9b65bd21dba2 100644 --- a/app/i18n/magento/de_de/composer.json +++ b/app/i18n/magento/de_de/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-de_de", "description": "German (Germany) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/en_us/composer.json b/app/i18n/magento/en_us/composer.json index bea506448dd19dff205a158935e9f667e46938ce..153bc0d9d3253be61f43226fae2fcf87ba063d19 100644 --- a/app/i18n/magento/en_us/composer.json +++ b/app/i18n/magento/en_us/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-en_us", "description": "English (United States) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/es_es/composer.json b/app/i18n/magento/es_es/composer.json index eabb494aca9d989888e139489ce574f802a1ee69..93032c4b83eb27ce4aa8f7a8392f0bc9f0bfd761 100644 --- a/app/i18n/magento/es_es/composer.json +++ b/app/i18n/magento/es_es/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-es_es", "description": "Spanish (Spain) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/fr_fr/composer.json b/app/i18n/magento/fr_fr/composer.json index 8fed26f370694dd95a6af4c71640793d4eee84bd..d3681cbfc371d5c942ae01c536b06c76aa2fe636 100644 --- a/app/i18n/magento/fr_fr/composer.json +++ b/app/i18n/magento/fr_fr/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-fr_fr", "description": "French (France) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/nl_nl/composer.json b/app/i18n/magento/nl_nl/composer.json index 7abf1aaf334e702dee76a6de4ee24e53b4931281..91b6f97e6e14afea0d8ef0ecf8837b4e32469345 100644 --- a/app/i18n/magento/nl_nl/composer.json +++ b/app/i18n/magento/nl_nl/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-nl_nl", "description": "Dutch (Netherlands) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/pt_br/composer.json b/app/i18n/magento/pt_br/composer.json index 38e2e86f66650c1dde5b59c30d103dafd0481de2..87a67bf386eab92396ae8988a5043826b8970de4 100644 --- a/app/i18n/magento/pt_br/composer.json +++ b/app/i18n/magento/pt_br/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-pt_br", "description": "Portuguese (Brazil) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/app/i18n/magento/zh_cn/composer.json b/app/i18n/magento/zh_cn/composer.json index 22c8c4fdb710de6d34baa9dd88ec92dff00329a0..0c70befdd1474c7272d190fd963d2f8b536dda47 100644 --- a/app/i18n/magento/zh_cn/composer.json +++ b/app/i18n/magento/zh_cn/composer.json @@ -1,13 +1,13 @@ { "name": "magento/language-zh_cn", "description": "Chinese (China) language", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.42.0-beta10", + "magento/framework": "0.42.0-beta11", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/composer.json b/composer.json index 66265b4b7155e73966984e9578ec4d5128973ee7..63dfea4e8a11e5131bea81fbaede3614dc76e5a3 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/project-community-edition", "description": "Magento project (Community Edition)", "type": "project", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/composer.lock b/composer.lock index dacd9c031b8e9f740807dcf41a4318ff2daeeed3..362b040032b7710e088c70c4a881a668f7442d21 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "8ddabb3c4956d1585308d5310203a7ab", + "hash": "07ed79cc8ac7d4c2c61e13cf87cbab40", "packages": [ { "name": "composer/composer", @@ -1865,16 +1865,16 @@ }, { "name": "fabpot/php-cs-fixer", - "version": "v1.5", + "version": "v1.5.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "2d6851520bf0250f668307ab2fd28cbb0b35d2b9" + "reference": "85777ebc6a1dac48c904acf9412b29b58b5dd592" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/2d6851520bf0250f668307ab2fd28cbb0b35d2b9", - "reference": "2d6851520bf0250f668307ab2fd28cbb0b35d2b9", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/85777ebc6a1dac48c904acf9412b29b58b5dd592", + "reference": "85777ebc6a1dac48c904acf9412b29b58b5dd592", "shasum": "" }, "require": { @@ -1914,7 +1914,7 @@ } ], "description": "A script to automatically fix Symfony Coding Standard", - "time": "2015-02-18 19:35:59" + "time": "2015-03-13 19:33:24" }, { "name": "league/climate", diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php index 04d751ca84e60f8dd3459735fbbbe59a3774fdf5..37f6f3e6f80aec5e058e10ac42ab5831466a3f8c 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php @@ -3104,4 +3104,5 @@ return [ ['Magento\Setup\Module\SetupFactory'], ['Magento\Framework\Module\Updater\SetupFactory'], ['Magento\Backend\Model\Config\Source\Yesno', 'Magento\Config\Model\Config\Source\Yesno'], + ['Magento\Reports\Model\Resource\Shopcart\Product\Collection'] ]; diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php index ddda706a93d3a73cc24e82a7c369a62d9fc36010..ffce52b8e4f2b438d4a4213c18a4c38fc59f91d7 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php @@ -2114,4 +2114,6 @@ return [ 'Magento\Integration\Helper\Validator', 'Magento\Integration\Model\CredentialsValidator::validate' ], + ['getProductEntityTypeId', 'Magento\Reports\Model\Resource\Product\Collection'], + ['setProductEntityTypeId', 'Magento\Reports\Model\Resource\Product\Collection'], ]; diff --git a/lib/internal/Magento/Framework/Api/Builder.php b/lib/internal/Magento/Framework/Api/Builder.php index 8096e4722c257993b248cbdba9f83febfe458754..9b7338a54e2788624477f5131966860e36b4b845 100644 --- a/lib/internal/Magento/Framework/Api/Builder.php +++ b/lib/internal/Magento/Framework/Api/Builder.php @@ -265,7 +265,7 @@ class Builder implements BuilderInterface } elseif (is_subclass_of($dataType, '\Magento\Framework\Model\AbstractExtensibleModel')) { return self::TYPE_DATA_MODEL; } - + $dataType = ltrim($dataType, '\\'); $sourceClassPreference = $this->objectManagerConfig->getPreference($dataType); if (empty($sourceClassPreference)) { throw new \LogicException( diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php index ec7df86387909e02b3b1ccd5323409705f644738..7a6b7208d18d10202aaf90b210f7342466cc0111 100644 --- a/lib/internal/Magento/Framework/AppInterface.php +++ b/lib/internal/Magento/Framework/AppInterface.php @@ -17,7 +17,7 @@ interface AppInterface /** * Magento version */ - const VERSION = '0.42.0-beta10'; + const VERSION = '0.42.0-beta11'; /** * Launch application diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 8b77b437ae7aa5a95571d297e89f181c0f0aaa2b..2650b2405cc313c4360d2b0f95e373c2bbf3e240 100644 --- a/lib/internal/Magento/Framework/composer.json +++ b/lib/internal/Magento/Framework/composer.json @@ -2,7 +2,7 @@ "name": "magento/framework", "description": "N/A", "type": "magento2-library", - "version": "0.42.0-beta10", + "version": "0.42.0-beta11", "license": [ "OSL-3.0", "AFL-3.0"