diff --git a/CHANGELOG.md b/CHANGELOG.md index a1d98332be0d5c39a997f7ce570933320e08c8e4..741aa9d1d7ce46126f5ca3c664d13540b84ec30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,59 @@ +0.74.0-beta15 +============= +* Framework Improvements: + * Introduced Drag&Drop Columns functionality in scope of Enhanced Data Grids on CMS + * Improved Column Actions functionality in scope of Enhanced Data Grids on CMS + * Adapted Payment\Gateway framework to client requirements + * Removed 'field_expr' option from filters + * Added product details renderer list support on Catalog category page + * Security: Clickjacking solution - introduced X-Frame-Options + * Gift message was moved to shopping cart + * Improved simple products export + * Separated import of advanced prices + * Changed 'updated_at' filter for products export + * Added the link with sample product import file + * Cleared and improved the messages and names in different modules + * Added mbstring extension as a requirement +* Tests + * Increased test coverage for the CatalogInventory, Email and Newsletter modules + * Added wait to form element before filling a value in functional tests + * Increased test coverage of Reports module + * Functional tests were fixed and maintained +* Fixed Bugs: + * Fixed loading of images from database media storage with separate connection + * Eliminated duplication of ComposerInformation class in Magento Framework and Setup Application + * Fixed an error message format inconsistency in theme uninstall command + * Fixed an issue where incorrect action name checks led to customer info leak + * Fixed an issue where /magento_version exposed too detailed version information + * Fixed an issue where generate data failed when table prefix exceeded length of 5 + * Fixed an issue where product options were displayed not styled on "Edit Product from Wishlist" Frontend page + * Fixed an issue where payment information was displayed broken on "Order Management" Backend page forms + * Fixed an issue where admin panel pop-ups contained lots of empty space + * Fixed an issue where Customer account form was displayed broken + * Fixed an issue where all text fields were invisible in Backend "Add New Customer" page + * Fixed XSS issues in Magento - wishlist sending + * Fixed an issue where it was unable to specify all values of "Multiple Select" Product Custom Option to purchase + * Fixed an issue where setting a permission for 'ALL Groups' produced an error if other permissions existed + * Fixed an issue where stock was not updated when Stock indexer was in Update on Schedule mode + * Fixed an issue where it was not possible to update stock items of product using API service + * Fixed an issue where Customer review changes in backend were not reflected in frontend until cache was cleared + * Fixed an issue where cache was not updated when changing stock status using mass action + * Fixed an issue where Stock Items API service to return low stock information did not return correct results + * Fixed an issue where found records in global search in Backend could not be selected via keyboard + * Fixed an issue where Category menu items went out of screen when page side was reached + * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly + * Fixed an issue where popup header was our of window range while creating group product + * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country + * Fixed an ability to edit the Order from Admin panel + * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout + * Fixed an issue where Products were not displayed correctly across all storeviews of the catalog +* Github Issues: + * [#1378](https://github.com/magento/magento2/issues/1319) -- jquery-cookie.js is not published by deploy tool in production mode + * [#1314](https://github.com/magento/magento2/pull/1314)-- Fixed a bug where type attribute for tag button was missing + * [#1354](https://github.com/magento/magento2/pull/1354) -- Add gitter.im badge to ReadMe. + * [#1378](https://github.com/magento/magento2/pull/1378) -- Fix incorrect js filename + + 0.74.0-beta14 ============= * Framework improvements: diff --git a/README.md b/README.md index 286d550ef93cad1b69a526ecebed4ee3e5d17cb3..eda495863d05bee57e91dd9818a1a50ff82c7cd7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [](https://travis-ci.org/magento/magento2) +[](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) <h2>Welcome</h2> Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results. diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json index 5ae1d3e4e2009835a572a2c9081ee74619532b51..536437a77046f9446799fcd13337f0927cf059b9 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json index 3e7abff2e19eca58d7d762c6f90932188af3aef6..3ad468649799034d1276c2dd8c87a9c9542ff9f3 100644 --- a/app/code/Magento/AdvancedPricingImportExport/composer.json +++ b/app/code/Magento/AdvancedPricingImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-catalog-import-export": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-catalog-import-export": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json index 9ce77947a0b214ceb0d0dd04c9e35f6e6c602ca2..34cf062da744cabb74763d6dd4e1cb4f51b0b31c 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.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json index b2b20216cf652a430d51f44492332e150011cd7d..736b6f9d688812f7cf6c76641c7048cb22aef09d 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.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-developer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-cron": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-reports": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-user": "0.74.0-beta14", - "magento/module-backup": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-translation": "0.74.0-beta14", - "magento/module-require-js": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-developer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-cron": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-reports": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-user": "0.74.0-beta15", + "magento/module-backup": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-translation": "0.74.0-beta15", + "magento/module-require-js": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json index 74b0a704e1de9374392c01a64e69b075fc416fde..22b5fa7ad13e30501fefd432dbd6abd7092b861a 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-cron": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-cron": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json index f3017a3a8dda032fb32a79cff12622d3cb601bc2..278203616826ca7b643d26a4b18b30befb0b8f2a 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-catalog-rule": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-gift-message": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-catalog-rule": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-gift-message": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.74.0-beta14" + "magento/module-webapi": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json index 78b23b0ff876b31caff7359c35e625ee986e6100..73005bc01aa19c301e06089b742c2fc94838136d 100755 --- a/app/code/Magento/BundleImportExport/composer.json +++ b/app/code/Magento/BundleImportExport/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-catalog-import-export": "0.74.0-beta14", - "magento/module-bundle": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-catalog-import-export": "0.74.0-beta15", + "magento/module-bundle": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json index 5f5a8b2ce39bfa5fff3162892d333dcbd8c1659f..f030ee269a32cfac2a479c63c5f4e16250e10b7f 100644 --- a/app/code/Magento/CacheInvalidate/composer.json +++ b/app/code/Magento/CacheInvalidate/composer.json @@ -3,12 +3,12 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-page-cache": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-page-cache": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json index 044ade39edc271c3b8d5d1b4f9aebcb1cc740e90..987ef790dfd28fc18a1e0a87488a86213f350154 100644 --- a/app/code/Magento/Captcha/composer.json +++ b/app/code/Magento/Captcha/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json index 7c1d49431e273833b821bae24c446d3364c6b458..5664aebe69dc555c7cbd17907e10817cee4e00d7 100644 --- a/app/code/Magento/Catalog/composer.json +++ b/app/code/Magento/Catalog/composer.json @@ -3,37 +3,37 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-log": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-wishlist": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-msrp": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-catalog-rule": "0.74.0-beta14", - "magento/module-product-alert": "0.74.0-beta14", - "magento/module-url-rewrite": "0.74.0-beta14", - "magento/module-catalog-url-rewrite": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-log": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-wishlist": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-msrp": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-catalog-rule": "0.74.0-beta15", + "magento/module-product-alert": "0.74.0-beta15", + "magento/module-url-rewrite": "0.74.0-beta15", + "magento/module-catalog-url-rewrite": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta14" + "magento/module-cookie": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json index ca381cabc50404db10ec64a2c7e635b69124c128..9f81689a2e32e10ea824acc247afdea084a2fe08 100644 --- a/app/code/Magento/CatalogImportExport/composer.json +++ b/app/code/Magento/CatalogImportExport/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json index fa1c799fe739d3bcf87ca6f916bcde0962624808..81dd41658e1e795b679f2f9e284b553609660041 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json index 539ca4af208560e40d7f890c9550308bde89485e..2769c69a24005ff315ce84cf5d2ee548c1fd5d1b 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.74.0-beta14", - "magento/module-rule": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-rule": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json index 1d8292288c1c06458eea32cb0b3985d82f3147a4..6c9cce17601c714d54f92b6a2430025f79395c56 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-search": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-search": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json index 764fb5ed8db3fc88023dba3f275a543386e34315..290be0bf17556f32deaf2a8dd1af28b4883ace8a 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-import-export": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-url-rewrite": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-import-export": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-url-rewrite": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json index a1708c5aa5d6b1c14848114666f7bb6e520eaa00..3f1bfb33e3f0ab88c266ebdb80202429257163d5 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.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-rule": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-wishlist": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-rule": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-wishlist": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json index 572909061f99a33ba2f588192618604966ddcdf2..f4d84dd1c413eecdd11e09907ff08e58476fbb56 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.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-gift-message": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-msrp": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-gift-message": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-msrp": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta14" + "magento/module-cookie": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json index 28936c416e31dc474a95b0687d98edef469ba886..13f10a6560e989f70548019e6eb5b043740c431b 100644 --- a/app/code/Magento/CheckoutAgreements/composer.json +++ b/app/code/Magento/CheckoutAgreements/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json index 74159635377d7d0ac47f23cd8474b47b4415610b..e635bc36075189903b844d5f4f7e6f5e1e695d41 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.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-email": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/module-variable": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-email": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/module-variable": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json index c5d23577dd32064af54e69ea0c18bf918232f32a..318b250d7650c989f67aed2704cd3ad9ee82be14 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.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-url-rewrite": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-url-rewrite": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php index 5cb02fb70512a02174cb60e6145c3095d0ba85af..623342951516a038acd8ae5beeb51081d53a491f 100644 --- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php +++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php @@ -7,7 +7,7 @@ namespace Magento\Config\Block\System\Config\Form\Fieldset; /** - * Magento\Config\Block\System\Config\Form\Fieldset object factory + * Magento\Config\Block\System\Config\Form\Fieldset Class Factory * * @codeCoverageIgnore */ diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php new file mode 100644 index 0000000000000000000000000000000000000000..3f8b7596fd4a541eebe52c9f8e30168dc48b35ee --- /dev/null +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php @@ -0,0 +1,173 @@ +<?php +/** + * Copyright © 2015 Magento. All rights reserved. + * See COPYING.txt for license details. + */ +namespace Magento\Config\Test\Unit\Block\System\Config; + +class DwstreeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @var \Magento\Config\Block\System\Config\Dwstree + */ + protected $object; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $requestMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $storeManagerMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $websiteMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $storeMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $context; + + protected function setUp() + { + $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface') + ->disableOriginalConstructor() + ->getMock(); + + $this->websiteMock = $this->getMockBuilder('Magento\Store\Model\Website') + ->disableOriginalConstructor() + ->getMock(); + + $this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store') + ->disableOriginalConstructor() + ->getMock(); + + $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + + $this->context = $objectManager->getObject( + 'Magento\Backend\Block\Template\Context', + [ + 'request' => $this->requestMock, + 'storeManager' => $this->storeManagerMock, + ] + ); + + $this->object = $objectManager->getObject( + 'Magento\Config\Block\System\Config\Dwstree', + ['context' => $this->context] + ); + } + + /** + * @param $section + * @param $website + * @param $store + * @dataProvider initTabsDataProvider + */ + public function testInitTabs($section, $website, $store) + { + $this->requestMock->expects($this->any()) + ->method('getParam') + ->will( + $this->returnValueMap( + [ + ['section', $section], + ['website', $website['expected']['code']], + ['store', $store['expected']['code']], + ] + ) + ); + $this->storeManagerMock->expects($this->once()) + ->method('getWebsites') + ->willReturn([$this->websiteMock]); + $this->websiteMock->expects($this->any()) + ->method('getCode') + ->willReturn($website['actual']['code']); + $this->websiteMock->expects($this->any()) + ->method('getName') + ->willReturn($website['expected']['name']); + $this->websiteMock->expects($this->once()) + ->method('getStores') + ->willReturn([$this->storeMock]); + $this->storeMock->expects($this->any()) + ->method('getCode') + ->willReturn($store['actual']['code']); + $this->storeMock->expects($this->any()) + ->method('getName') + ->willReturn($store['actual']['name']); + + $this->assertEquals($this->object, $this->object->initTabs()); + + $this->assertEquals( + [ + 'default', + 'website_' . $website['actual']['code'], + 'store_' . $store['actual']['code'] + ], + $this->object->getTabsIds() + ); + } + + public function initTabsDataProvider() + { + return [ + 'matchAll' => [ + 'scope' => 'Test Scope', + 'website' => [ + 'expected' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + 'actual' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + ], + 'store' => [ + 'expected' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + 'actual' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + ], + ], + 'matchStore' => [ + 'scope' => 'Test Scope', + 'website' => [ + 'expected' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + 'actual' => ['name' => false, 'code' => false], + ], + 'store' => [ + 'expected' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + 'actual' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + ], + ], + 'matchWebsite' => [ + 'scope' => 'Test Scope', + 'website' => [ + 'expected' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + 'actual' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + ], + 'store' => [ + 'expected' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + 'actual' => ['name' => false, 'code' => false], + ], + ], + 'noMatch' => [ + 'scope' => 'Test Scope', + 'website' => [ + 'expected' => ['name' => 'Test Website Name', 'code' => 'Test Website Code'], + 'actual' => ['name' => false, 'code' => false], + ], + 'store' => [ + 'expected' => ['name' => 'Test Store Name', 'code' => 'Test Store Code'], + 'actual' => ['name' => false, 'code' => false], + ], + ], + ]; + } +} diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/EditTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/EditTest.php index 11ae924fe7ac294734c7ce67feffd2417a8b9bb4..323ec70a02c9d0daf2e43d290750ce3e64b8acd2 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/EditTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/EditTest.php @@ -145,4 +145,43 @@ class EditTest extends \PHPUnit_Framework_TestCase $this->assertEquals($expectedUrl, $this->_object->getSaveUrl()); } + + public function testPrepareLayout() + { + $expectedHeader = 'Test Header'; + $expectedLabel = 'Test Label'; + $expectedBlock = 'Test Block'; + + $blockMock = $this->getMockBuilder('Magento\Framework\View\Element\Template') + ->disableOriginalConstructor() + ->getMock(); + + $this->_sectionMock->expects($this->once()) + ->method('getFrontendModel') + ->willReturn($expectedBlock); + $this->_sectionMock->expects($this->once()) + ->method('getLabel') + ->willReturn($expectedLabel); + $this->_sectionMock->expects($this->once()) + ->method('getHeaderCss') + ->willReturn($expectedHeader); + $this->_layoutMock->expects($this->once()) + ->method('getBlock') + ->with('page.actions.toolbar') + ->willReturn($blockMock); + $this->_layoutMock->expects($this->once()) + ->method('createBlock') + ->with($expectedBlock) + ->willReturn($blockMock); + $blockMock->expects($this->once()) + ->method('getNameInLayout') + ->willReturn($expectedBlock); + $this->_layoutMock->expects($this->once()) + ->method('setChild') + ->with($expectedBlock, $expectedBlock, 'form') + ->willReturn($this->_layoutMock); + + $this->_object->setNameInLayout($expectedBlock); + $this->_object->setLayout($this->_layoutMock); + } } diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php index 2c7125e9748104e156d1e0ae6b383b65b5502700..4e3579dde64ca8791c2e9c2cbd8a2ad550b9e896 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php @@ -71,7 +71,8 @@ class FieldTest extends \PHPUnit_Framework_TestCase 'getInherit', 'getCanUseWebsiteValue', 'getCanUseDefaultValue', - 'setDisabled' + 'setDisabled', + 'getTooltip', ], [], '', @@ -140,6 +141,19 @@ class FieldTest extends \PHPUnit_Framework_TestCase $this->assertContains($expected, $actual); } + public function testRenderValueWithTooltipBlock() + { + $testTooltip = 'test_tooltip'; + $this->_elementMock->expects($this->any())->method('getTooltip')->will($this->returnValue($testTooltip)); + $expected = '<td class="value with-tooltip">' . + $this->_testData['elementHTML'] . + '<div class="tooltip"><span class="help"><span></span></span><div class="tooltip-content">' . + $testTooltip . + '</div></div></td>'; + $actual = $this->_object->render($this->_elementMock); + $this->assertContains($expected, $actual); + } + public function testRenderHint() { $testHint = 'test_hint'; diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php index 6f5fa46f65a237ea26bf676537d91aac3c6d4ade..10fc39366922c25b5d2b295ad8ef1a30ba8efecf 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php @@ -7,102 +7,236 @@ namespace Magento\Config\Test\Unit\Block\System\Config\Form\Fieldset\Modules; class DisableOutputTest extends \PHPUnit_Framework_TestCase { - public function testRender() + /** + * @var \Magento\Config\Block\System\Config\Form\Fieldset\Modules\DisableOutput + */ + protected $object; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $elementMock; + + /** + * @var array + */ + protected $elementData = [ + 'htmlId' => 'test_field_id', + 'name' => 'test_name', + 'label' => 'test_label', + 'elementHTML' => 'test_html', + 'legend' => 'test_legend', + 'comment' => 'test_comment', + 'tooltip' => 'test_tooltip', + ]; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $layoutMock; + + /** + * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager + */ + protected $objectManager; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $moduleListMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $authSessionMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $userMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $jsHelperMock; + + /** + * @return void + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + protected function setUp() { - $testData = [ - 'htmlId' => 'test_field_id', - 'label' => 'test_label', - 'elementHTML' => 'test_html', - 'legend' => 'test_legend', - 'comment' => 'test_comment', - ]; - - $testModuleList = [ - 'testModuleWithConfigData', - 'testModuleNoConfigData', - ]; + $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $configData = ['advanced/modules_disable_output/testModuleWithConfigData' => 'testModuleData']; - - $fieldMock = $this->getMockBuilder('Magento\Config\Block\System\Config\Form\Field') + $rendererMock = $this->getMockBuilder('Magento\Config\Block\System\Config\Form\Field') ->disableOriginalConstructor() ->getMock(); - $layoutMock = $this->getMockBuilder('Magento\Framework\View\Layout') + $this->layoutMock = $this->getMockBuilder('Magento\Framework\View\Layout') ->disableOriginalConstructor() ->getMock(); - $layoutMock->expects($this->once()) + $this->layoutMock->expects($this->any()) ->method('getBlockSingleton') - ->with('Magento\Config\Block\System\Config\Form\Field') - ->willReturn($fieldMock); + ->willReturn($rendererMock); - $groupMock = $this->getMockBuilder('Magento\Config\Model\Config\Structure\Element\Group') + $this->jsHelperMock = $this->getMockBuilder('Magento\Framework\View\Helper\Js') ->disableOriginalConstructor() ->getMock(); - $groupMock->expects($this->once())->method('getFieldsetCss')->willReturn('test_fieldset_css'); - $elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Text') + $this->moduleListMock = $this->getMockBuilder('Magento\Framework\Module\ModuleListInterface') + ->setMethods(['getNames', 'has', 'getAll', 'getOne']) ->disableOriginalConstructor() - ->setMethods( - [ - 'getHtmlId', 'getExpanded', 'getElements', 'getLegend', - 'getComment', 'addField', 'setRenderer', 'toHtml' - ] - )->getMock(); + ->getMock(); - $elementMock->expects($this->any()) - ->method('getHtmlId') - ->willReturn($testData['htmlId']); + $this->moduleListMock->expects($this->any()) + ->method('getNames') + ->will($this->returnValue(['Test Name'])); + $this->moduleListMock->expects($this->any()) + ->method('has') + ->will($this->returnValue(true)); + $this->moduleListMock->expects($this->any()) + ->method('getAll') + ->will($this->returnValue([])); + $this->moduleListMock->expects($this->any()) + ->method('getOne') + ->will($this->returnValue(null)); + + $this->authSessionMock = $this->getMockBuilder('Magento\Backend\Model\Auth\Session') + ->setMethods(['getUser']) + ->disableOriginalConstructor() + ->getMock(); + + $this->userMock = $this->getMockBuilder('Magento\User\Model\User') + ->setMethods(['getExtra']) + ->disableOriginalConstructor() + ->getMock(); - $elementMock->expects($this->any())->method('getExpanded')->willReturn(true); - $elementMock->expects($this->any())->method('getLegend')->willReturn($testData['legend']); - $elementMock->expects($this->any())->method('getComment')->willReturn($testData['comment']); - $elementMock->expects($this->any())->method('addField')->willReturn($elementMock); - $elementMock->expects($this->any())->method('setRenderer')->willReturn($elementMock); - $elementMock->expects($this->any())->method('toHtml')->willReturn('test_element_html'); + $this->authSessionMock->expects($this->any()) + ->method('getUser') + ->willReturn($this->userMock); - $moduleListMock = $this->getMockBuilder('Magento\Framework\Module\ModuleList') + $groupMock = $this->getMockBuilder('Magento\Config\Model\Config\Structure\Element\Group') + ->setMethods(['getFieldsetCss']) ->disableOriginalConstructor() ->getMock(); - $moduleListMock->expects($this->any())->method('getNames')->willReturn( - array_merge(['Magento_Backend'], $testModuleList) - ); + $groupMock->expects($this->any())->method('getFieldsetCss')->will($this->returnValue('test_fieldset_css')); $factory = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory') ->disableOriginalConstructor() ->getMock(); - $factoryColl = $this->getMockBuilder('Magento\Framework\Data\Form\Element\CollectionFactory') ->disableOriginalConstructor() ->getMock(); + $formMock = $this->getMock('Magento\Framework\Data\Form\AbstractForm', [], [$factory, $factoryColl]); - $formMock = $this->getMockBuilder('Magento\Framework\Data\Form\AbstractForm') - ->disableOriginalConstructor() - ->setConstructorArgs([$factory, $factoryColl]) - ->getMock(); + $context = $this->objectManager->getObject( + 'Magento\Backend\Block\Context', + [ + 'layout' => $this->layoutMock, + ] + ); - $formMock->expects($this->any())->method('getConfigValue')->willReturn('testConfigData'); + $data = [ + 'context' => $context, + 'authSession' => $this->authSessionMock, + 'jsHelper' => $this->jsHelperMock, + 'moduleList' => $this->moduleListMock, + 'data' => [ + 'group' => $groupMock, + 'form' => $formMock, + ], + ]; - $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); - $object = $objectManager->getObject( + $this->object = $this->objectManager->getObject( 'Magento\Config\Block\System\Config\Form\Fieldset\Modules\DisableOutput', - [ - 'moduleList' => $moduleListMock, - 'layout' => $layoutMock, - 'data' => [ - 'group' => $groupMock, - 'form' => $formMock, - 'config_data' => $configData, - ], - ] + $data ); - $collection = $objectManager->getObject('Magento\Framework\Data\Form\Element\Collection'); - $elementMock->expects($this->any())->method('getElements')->willReturn($collection); + $this->elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Text') + ->setMethods( + [ + 'getId', 'getHtmlId', 'getName', 'getExpanded', 'getLegend', 'getComment', 'getTooltip', 'toHtml', + 'addField', 'setRenderer', 'getElements', 'getIsNested' + ] + ) + ->disableOriginalConstructor() + ->disableOriginalClone() + ->enableAutoload() + ->getMock(); - $actualHtml = $object->render($elementMock); - $this->assertContains('test_element_html', $actualHtml); - $this->assertContains('test_field_id', $actualHtml); - $this->assertContains('test_comment', $actualHtml); + $this->elementMock->expects($this->any()) + ->method('getId') + ->will($this->returnValue($this->elementData['htmlId'])); + $this->elementMock->expects($this->any()) + ->method('getHtmlId') + ->will($this->returnValue($this->elementData['htmlId'])); + $this->elementMock->expects($this->any()) + ->method('getName') + ->will($this->returnValue($this->elementData['name'])); + $this->elementMock->expects($this->any()) + ->method('getLegend') + ->will($this->returnValue($this->elementData['legend'])); + $this->elementMock->expects($this->any()) + ->method('getComment') + ->will($this->returnValue($this->elementData['comment'])); + $this->elementMock->expects($this->any()) + ->method('getTooltip') + ->will($this->returnValue($this->elementData['tooltip'])); + $this->elementMock->expects($this->any()) + ->method('toHtml') + ->will($this->returnValue($this->elementData['elementHTML'])); + $this->elementMock->expects($this->any()) + ->method('addField') + ->will($this->returnValue($this->elementMock)); + $this->elementMock->expects($this->any()) + ->method('setRenderer') + ->will($this->returnValue($this->elementMock)); + $this->elementMock->expects($this->any()) + ->method('getElements') + ->will($this->returnValue([$this->elementMock])); + } + + /** + * @param $expanded + * @param $nested + * @param $extra + * @dataProvider renderDataProvider + */ + public function testRender($expanded, $nested, $extra) + { + $this->elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue($expanded)); + $this->elementMock->expects($this->any())->method('getIsNested')->will($this->returnValue($nested)); + $this->userMock->expects($this->any())->method('getExtra')->willReturn($extra); + $actualHtml = $this->object->render($this->elementMock); + + $this->assertContains($this->elementData['htmlId'], $actualHtml); + $this->assertContains($this->elementData['legend'], $actualHtml); + $this->assertContains($this->elementData['comment'], $actualHtml); + $this->assertContains($this->elementData['tooltip'], $actualHtml); + $this->assertContains($this->elementData['elementHTML'], $actualHtml); + if ($nested) { + $this->assertContains('nested', $actualHtml); + } + } + + public function renderDataProvider() + { + return [ + 'expandedNestedExtra' => [ + 'expanded' => true, + 'nested' => true, + 'extra' => [], + ], + 'collapsedNotNestedExtra' => [ + 'expanded' => false, + 'nested' => false, + 'extra' => ['configState' => [$this->elementData['htmlId'] => true]], + ], + 'collapsedNotNestedNoExtra' => [ + 'expanded' => false, + 'nested' => false, + 'extra' => [], + ], + ]; } } diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php index ec6521ec090ac75e2c0442e06fecd77eb4742b04..e1d4f266467e194a77f43539f0eba25c647ae5c7 100644 --- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php +++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php @@ -30,7 +30,15 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase /** * @var array */ - protected $_testData; + protected $testData = [ + 'htmlId' => 'test_field_id', + 'name' => 'test_name', + 'label' => 'test_label', + 'elementHTML' => 'test_html', + 'legend' => 'test_legend', + 'comment' => 'test_comment', + 'tooltip' => 'test_tooltip', + ]; /** * @var \PHPUnit_Framework_MockObject_MockObject @@ -47,16 +55,42 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase */ protected $_helperMock; + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $authSessionMock; + + /** + * @var \PHPUnit_Framework_MockObject_MockObject + */ + protected $userMock; + + /** + * @return void + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ protected function setUp() { - $this->_requestMock = $this->getMock( - 'Magento\Framework\App\RequestInterface', - [], - [], - '', - false, - false - ); + $this->authSessionMock = $this->getMockBuilder('Magento\Backend\Model\Auth\Session') + ->setMethods(['getUser']) + ->disableOriginalConstructor() + ->getMock(); + + $this->userMock = $this->getMockBuilder('Magento\User\Model\User') + ->setMethods(['getExtra']) + ->disableOriginalConstructor() + ->getMock(); + + $this->authSessionMock->expects($this->any()) + ->method('getUser') + ->willReturn($this->userMock); + + $this->_requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface') + ->disableOriginalConstructor() + ->getMock(); + $this->_requestMock->expects($this->any()) + ->method('getParam') + ->willReturn('Test Param'); $this->_urlModelMock = $this->getMock('Magento\Backend\Model\Url', [], [], '', false, false); $this->_layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false, false); $groupMock = $this->getMock( @@ -66,12 +100,13 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase '', false ); - $groupMock->expects($this->once())->method('getFieldsetCss')->will($this->returnValue('test_fieldset_css')); + $groupMock->expects($this->any())->method('getFieldsetCss')->will($this->returnValue('test_fieldset_css')); $this->_helperMock = $this->getMock('Magento\Framework\View\Helper\Js', [], [], '', false, false); $data = [ 'request' => $this->_requestMock, + 'authSession' => $this->authSessionMock, 'urlBuilder' => $this->_urlModelMock, 'layout' => $this->_layoutMock, 'jsHelper' => $this->_helperMock, @@ -80,18 +115,9 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase $this->_testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $this->_object = $this->_testHelper->getObject('Magento\Config\Block\System\Config\Form\Fieldset', $data); - $this->_testData = [ - 'htmlId' => 'test_field_id', - 'name' => 'test_name', - 'label' => 'test_label', - 'elementHTML' => 'test_html', - 'legend' => 'test_legend', - 'comment' => 'test_comment', - ]; - $this->_elementMock = $this->getMock( 'Magento\Framework\Data\Form\Element\Text', - ['getHtmlId', 'getName', 'getExpanded', 'getElements', 'getLegend', 'getComment'], + ['getId', 'getHtmlId', 'getName', 'getElements', 'getLegend', 'getComment', 'getIsNested', 'getExpanded'], [], '', false, @@ -99,67 +125,75 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase true ); - $this->_elementMock->expects( - $this->any() - )->method( - 'getHtmlId' - )->will( - $this->returnValue($this->_testData['htmlId']) - ); - $this->_elementMock->expects( - $this->any() - )->method( - 'getName' - )->will( - $this->returnValue($this->_testData['name']) - ); - $this->_elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue(true)); - $this->_elementMock->expects( - $this->any() - )->method( - 'getLegend' - )->will( - $this->returnValue($this->_testData['legend']) - ); - $this->_elementMock->expects( - $this->any() - )->method( - 'getComment' - )->will( - $this->returnValue($this->_testData['comment']) - ); + $this->_elementMock->expects($this->any()) + ->method('getId') + ->will($this->returnValue($this->testData['htmlId'])); + $this->_elementMock->expects($this->any()) + ->method('getHtmlId') + ->will($this->returnValue($this->testData['htmlId'])); + $this->_elementMock->expects($this->any()) + ->method('getName') + ->will($this->returnValue($this->testData['name'])); + $this->_elementMock->expects($this->any()) + ->method('getLegend') + ->will($this->returnValue($this->testData['legend'])); + $this->_elementMock->expects($this->any()) + ->method('getComment') + ->will($this->returnValue($this->testData['comment'])); } - public function testRenderWithoutStoredElements() + /** + * @param $expanded + * @param $nested + * @param extra + * @dataProvider testRenderWithoutStoredElementsDataProvider + */ + public function testRenderWithoutStoredElements($expanded, $nested, $extra) { + $this->userMock->expects($this->any())->method('getExtra')->willReturn($extra); $collection = $this->_testHelper->getObject('Magento\Framework\Data\Form\Element\Collection'); $this->_elementMock->expects($this->any())->method('getElements')->will($this->returnValue($collection)); + $this->_elementMock->expects($this->any())->method('getIsNested')->will($this->returnValue($nested)); + $this->_elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue($expanded)); $actualHtml = $this->_object->render($this->_elementMock); - $this->assertContains($this->_testData['htmlId'], $actualHtml); - $this->assertContains($this->_testData['legend'], $actualHtml); - $this->assertContains($this->_testData['comment'], $actualHtml); + $this->assertContains($this->testData['htmlId'], $actualHtml); + $this->assertContains($this->testData['legend'], $actualHtml); + $this->assertContains($this->testData['comment'], $actualHtml); + if ($nested) { + $this->assertContains('nested', $actualHtml); + } } - public function testRenderWithStoredElements() + /** + * @param $expanded + * @param $nested + * @param $extra + * @dataProvider testRenderWithStoredElementsDataProvider + */ + public function testRenderWithStoredElements($expanded, $nested, $extra) { + $this->userMock->expects($this->any())->method('getExtra')->willReturn($extra); $this->_helperMock->expects($this->any())->method('getScript')->will($this->returnArgument(0)); - - $fieldMock = $this->getMock( - 'Magento\Framework\Data\Form\Element\Text', - ['getId', 'getTooltip', 'toHtml'], - [], - '', - false, - false, - true - ); - + $fieldMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Text') + ->setMethods(['getId', 'getTooltip', 'toHtml', 'getHtmlId', 'getIsNested', 'getExpanded']) + ->disableOriginalConstructor() + ->getMock(); $fieldMock->expects($this->any())->method('getId')->will($this->returnValue('test_field_id')); $fieldMock->expects($this->any())->method('getTooltip')->will($this->returnValue('test_field_tootip')); $fieldMock->expects($this->any())->method('toHtml')->will($this->returnValue('test_field_toHTML')); + $fieldMock->expects($this->any())->method('getHtmlId')->willReturn('test_field_HTML_id'); + + $fieldSetMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Fieldset') + ->setMethods(['getId', 'getTooltip', 'toHtml', 'getHtmlId', 'getIsNested', 'getExpanded']) + ->disableOriginalConstructor() + ->getMock(); + $fieldSetMock->expects($this->any())->method('getId')->will($this->returnValue('test_fieldset_id')); + $fieldSetMock->expects($this->any())->method('getTooltip')->will($this->returnValue('test_fieldset_tootip')); + $fieldSetMock->expects($this->any())->method('toHtml')->will($this->returnValue('test_fieldset_toHTML')); + $fieldSetMock->expects($this->any())->method('getHtmlId')->willReturn('test_fieldset_HTML_id'); - $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); $factory = $this->getMock('Magento\Framework\Data\Form\Element\Factory', [], [], '', false); + $factoryColl = $this->getMock( 'Magento\Framework\Data\Form\Element\CollectionFactory', [], @@ -167,13 +201,19 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase '', false ); + $formMock = $this->getMock('Magento\Framework\Data\Form\AbstractForm', [], [$factory, $factoryColl]); - $collection = $helper->getObject( + + $collection = $this->_testHelper->getObject( 'Magento\Framework\Data\Form\Element\Collection', ['container' => $formMock] ); $collection->add($fieldMock); + $collection->add($fieldSetMock); + $this->_elementMock->expects($this->any())->method('getElements')->will($this->returnValue($collection)); + $this->_elementMock->expects($this->any())->method('getIsNested')->will($this->returnValue($nested)); + $this->_elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue($expanded)); $actual = $this->_object->render($this->_elementMock); @@ -182,5 +222,48 @@ class FieldsetTest extends \PHPUnit_Framework_TestCase $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box"' . ' style="display:none;">test_field_tootip</div>'; $this->assertContains($expected, $actual); + if ($nested) { + $this->assertContains('nested', $actual); + } + } + + /** + * @return array + */ + public function testRenderWithoutStoredElementsDataProvider() + { + return $this->dataProvider(); + } + + /** + * @return array + */ + public function testRenderWithStoredElementsDataProvider() + { + return $this->dataProvider(); + } + + /** + * @return array + */ + protected function dataProvider() + { + return [ + 'expandedNestedExtra' => [ + 'expanded' => true, + 'nested' => true, + 'extra' => [], + ], + 'collapsedNotNestedExtra' => [ + 'expanded' => false, + 'nested' => false, + 'extra' => ['configState' => [$this->testData['htmlId'] => true]], + ], + 'collapsedNotNestedNoExtra' => [ + 'expanded' => false, + 'nested' => false, + 'extra' => [], + ], + ]; } } diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json index cc83e07515d7c6e3f56c531d84d10edcceb1226e..202d760a77d18360d74c9c13ad6ff720257f1361 100644 --- a/app/code/Magento/Config/composer.json +++ b/app/code/Magento/Config/composer.json @@ -3,17 +3,17 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-cron": "0.74.0-beta14", - "magento/module-email": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-cron": "0.74.0-beta15", + "magento/module-email": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json index 8d04a7bae07ab90d74604415193102a43f299075..d3b43f6b2c89cebbc90db6965afb7b35339f3532 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.74.0-beta14", - "magento/module-catalog-import-export": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-configurable-product": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-import-export": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-configurable-product": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json index d67c88a3d956bb5c369acb68c95818f9d10047c2..bba5a6cb80801b75e3a58c0d1660c768787eeb1b 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-msrp": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-catalog-rule": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-msrp": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-catalog-rule": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-webapi": "0.74.0-beta14" + "magento/module-webapi": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json index b439ea140c197b1ed56baf1e2d815da1401ad79b..811f9db9c949c9fcc5877905776039105c19335d 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json index 544fd07a9c3789660daca22b02bfc19ba3f3aef5..0135db41f94b4435603e54b98f7b44db55e9c085 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.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-backend": "0.74.0-beta14" + "magento/module-backend": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json index 6399fb6b9e9020bfbbdcd39b429d38acd51db867..3dfb26ce77621f8ed772c7cbcafbd7ec0423a736 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json index 84def1d3cbe14acfc288d09d027e68ac7ef0514f..6483dd03c9e1f55db24a962744a73132c5931f8a 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json index 0eece788e93cecb4c80b798123ea44284882baca..dee5a235594a0442cb4a5385ee820b53234f8582 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.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-newsletter": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-wishlist": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-review": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", - "magento/module-integration": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-newsletter": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-wishlist": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-review": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", + "magento/module-integration": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta14" + "magento/module-cookie": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json index b6a1e407f40a90d40681457f8b3c44f71a51810b..9fc8a75b0a1024c0b8daf7221968ba40410c68a6 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json index b1da5a0bdcd348ed89d44f6c55133d29d268e728..6e08b71249827713a36270a73e01a206da5fc1f3 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.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-translation": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-translation": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json index a48bb0105867b156433a4addf530adbefcf87e48..b24b34c4217b7322b25f1c69a1075ad616f5e286 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.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json index 02b7d41aa6e9cb7951f25396c7d440274d5b0d56..22bad15575a0e47c3b56e53095e34cf76d61e2c6 100644 --- a/app/code/Magento/Dhl/composer.json +++ b/app/code/Magento/Dhl/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json index 23ab56ed5a4f107e2748d9c98f7a78fe3b762bc4..9978cf2f0261f4e80bcb56bb9f9c64a74ccba91d 100644 --- a/app/code/Magento/Directory/composer.json +++ b/app/code/Magento/Directory/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json index b28ee43df4619e46d9314a36a88369cb34ce7a94..20ef84dcbb984fbe254d685219677e58a293a897 100644 --- a/app/code/Magento/Downloadable/composer.json +++ b/app/code/Magento/Downloadable/composer.json @@ -3,27 +3,27 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-gift-message": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-msrp": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-gift-message": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-msrp": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json index 27a79fab2f4a2d182e3df0749481b2877d6eb5cf..caa8721af55b8e7b90228cd86b38de5aec349f91 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php index a349f5d9ed0708300e369fb97800dc258f3ded2d..2bb54a0333a138ec34f36e4362d22018e2fbef1d 100644 --- a/app/code/Magento/Email/Model/Template.php +++ b/app/code/Magento/Email/Model/Template.php @@ -7,7 +7,6 @@ namespace Magento\Email\Model; use Magento\Email\Model\Template\Filter; use Magento\Framework\App\Filesystem\DirectoryList; -use Magento\Framework\Filter\Template as FilterTemplate; use Magento\Store\Model\ScopeInterface; use Magento\Store\Model\StoreManagerInterface; @@ -76,7 +75,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento /** * Email template filter * - * @var FilterTemplate + * @var Filter */ protected $_templateFilter; @@ -278,10 +277,10 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento /** * Declare template processing filter * - * @param FilterTemplate $filter + * @param Filter $filter * @return $this */ - public function setTemplateFilter(FilterTemplate $filter) + public function setTemplateFilter(Filter $filter) { $this->_templateFilter = $filter; return $this; diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php index c95b3f4e21572e16f38fdb967abf3ccc25a582e8..18ed7a756916ecbd28a78ef4fa82b562950c953a 100644 --- a/app/code/Magento/Email/Model/Template/Filter.php +++ b/app/code/Magento/Email/Model/Template/Filter.php @@ -110,6 +110,13 @@ class Filter extends \Magento\Framework\Filter\Template */ protected $backendUrlBuilder; + /** + * Include processor + * + * @var callable|null + */ + protected $_includeProcessor = null; + /** * @param \Magento\Framework\Stdlib\String $string * @param \Psr\Log\LoggerInterface $logger @@ -216,6 +223,49 @@ class Filter extends \Magento\Framework\Filter\Template return $this->_storeId; } + /** + * @param string[] $construction + * @return mixed + */ + public function includeDirective($construction) + { + // Processing of {include template=... [...]} statement + $includeParameters = $this->_getIncludeParameters($construction[2]); + if (!isset($includeParameters['template']) or !$this->getIncludeProcessor()) { + // Not specified template or not set include processor + $replacedValue = '{Error in include processing}'; + } else { + // Including of template + $templateCode = $includeParameters['template']; + unset($includeParameters['template']); + $includeParameters = array_merge_recursive($includeParameters, $this->_templateVars); + $replacedValue = call_user_func($this->getIncludeProcessor(), $templateCode, $includeParameters); + } + return $replacedValue; + } + + /** + * Sets the processor of includes. + * + * @param callable $callback it must return string + * @return $this + */ + public function setIncludeProcessor(array $callback) + { + $this->_includeProcessor = $callback; + return $this; + } + + /** + * Sets the processor of includes. + * + * @return callable|null + */ + public function getIncludeProcessor() + { + return is_callable($this->_includeProcessor) ? $this->_includeProcessor : null; + } + /** * Retrieve Block html directive * diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php index 3c89c3a8532971729ea0a7fcbb408ef0854fb2a3..eddac2ab9c0b1b67de2d660a25e910f713019bdf 100644 --- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php @@ -71,6 +71,11 @@ class TemplateTest extends \PHPUnit_Framework_TestCase */ private $emailConfig; + /** + * @var \Magento\Email\Model\Template\Filter|\PHPUnit_Framework_MockObject_MockObject + */ + private $filterTemplate; + public function setUp() { $this->context = $this->getMockBuilder('Magento\Framework\Model\Context') @@ -107,6 +112,18 @@ class TemplateTest extends \PHPUnit_Framework_TestCase $this->emailConfig = $this->getMockBuilder('Magento\Email\Model\Template\Config') ->disableOriginalConstructor() ->getMock(); + $this->filterTemplate = $this->getMockBuilder('Magento\Email\Model\Template\Filter') + ->disableOriginalConstructor() + ->getMock(); + $this->filterTemplate->expects($this->any()) + ->method('setUseAbsoluteLinks') + ->will($this->returnSelf()); + $this->filterTemplate->expects($this->any()) + ->method('setStoreId') + ->will($this->returnSelf()); + $this->emailFilterFactory->expects($this->any()) + ->method('create') + ->will($this->returnValue($this->filterTemplate)); } /** @@ -150,27 +167,12 @@ class TemplateTest extends \PHPUnit_Framework_TestCase public function testSetAndGetTemplateFilter() { $model = $this->getModelMock(); - $filterTemplate = $this->getMockBuilder('Magento\Framework\Filter\Template') - ->disableOriginalConstructor() - ->getMock(); - $model->setTemplateFilter($filterTemplate); - $this->assertSame($filterTemplate, $model->getTemplateFilter()); + $model->setTemplateFilter($this->filterTemplate); + $this->assertSame($this->filterTemplate, $model->getTemplateFilter()); } public function testGetTemplateFilterWithEmptyValue() { - $filterTemplate = $this->getMockBuilder('Magento\Framework\Filter\Template') - ->setMethods(['setUseAbsoluteLinks', 'setStoreId']) - ->disableOriginalConstructor() - ->getMock(); - $filterTemplate->expects($this->once()) - ->method('setUseAbsoluteLinks') - ->will($this->returnSelf()); - $filterTemplate->expects($this->once()) - ->method('setStoreId') - ->will($this->returnSelf()); - $this->emailFilterFactory->method('create') - ->will($this->returnValue($filterTemplate)); $designConfig = $this->getMockBuilder('Magento\Framework\Object') ->setMethods(['getStore']) ->disableOriginalConstructor() @@ -181,7 +183,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase ->method('getDesignConfig') ->will($this->returnValue($designConfig)); - $this->assertSame($filterTemplate, $model->getTemplateFilter()); + $this->assertSame($this->filterTemplate, $model->getTemplateFilter()); } /** @@ -408,29 +410,18 @@ class TemplateTest extends \PHPUnit_Framework_TestCase */ public function testGetProcessedTemplate($variables, $templateType, $storeId, $expectedVariables, $expectedResult) { - $filterTemplate = $this->getMockBuilder('Magento\Framework\Filter\Template') - ->setMethods([ - 'setUseSessionInUrl', - 'setPlainTemplateMode', - 'setVariables', - 'setStoreId', - 'filter', - 'getStoreId', - ]) - ->disableOriginalConstructor() - ->getMock(); - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('setUseSessionInUrl') ->with(false) ->will($this->returnSelf()); - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('setPlainTemplateMode') ->with($templateType === \Magento\Framework\App\TemplateTypesInterface::TYPE_TEXT) ->will($this->returnSelf()); - $filterTemplate->expects($this->any()) + $this->filterTemplate->expects($this->any()) ->method('setStoreId') ->will($this->returnSelf()); - $filterTemplate->expects($this->any()) + $this->filterTemplate->expects($this->any()) ->method('getStoreId') ->will($this->returnValue($storeId)); @@ -446,7 +437,6 @@ class TemplateTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue($store)); $model = $this->getModelMock(['getDesignConfig', '_applyDesignConfig', 'getPreparedTemplateText']); - $model->setTemplateFilter($filterTemplate); $model->setTemplateType($templateType); $designConfig = $this->getMockBuilder('Magento\Framework\Object') @@ -454,13 +444,19 @@ class TemplateTest extends \PHPUnit_Framework_TestCase ->disableOriginalConstructor() ->getMock(); $storeId = 'storeId'; - $designConfig->expects($this->once()) + $designConfig->expects($this->exactly(2)) ->method('getStore') ->will($this->returnValue($storeId)); $model->expects($this->once()) + ->method('_applyDesignConfig') + ->willReturnSelf(); + $model->expects($this->exactly(2)) ->method('getDesignConfig') ->will($this->returnValue($designConfig)); - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) + ->method('setIncludeProcessor') + ->willReturnSelf(); + $this->filterTemplate->expects($this->once()) ->method('setVariables') ->with(array_merge([ 'this' => $model], $expectedVariables)); @@ -468,7 +464,7 @@ class TemplateTest extends \PHPUnit_Framework_TestCase $model->expects($this->once()) ->method('getPreparedTemplateText') ->will($this->returnValue($preparedTemplateText)); - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('filter') ->with($preparedTemplateText) ->will($this->returnValue($expectedResult)); @@ -556,13 +552,9 @@ class TemplateTest extends \PHPUnit_Framework_TestCase $templateSubject = 'templateSubject'; $model->setTemplateSubject($templateSubject); - $filterTemplate = $this->getMockBuilder('Magento\Framework\Filter\Template') - ->setMethods(['setVariables', 'setStoreId', 'filter']) - ->disableOriginalConstructor() - ->getMock(); $model->expects($this->once()) ->method('getTemplateFilter') - ->will($this->returnValue($filterTemplate)); + ->will($this->returnValue($this->filterTemplate)); $model->expects($this->once()) ->method('_applyDesignConfig'); @@ -579,18 +571,18 @@ class TemplateTest extends \PHPUnit_Framework_TestCase ->method('getDesignConfig') ->will($this->returnValue($designConfig)); - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('setStoreId') ->with($storeId) ->will($this->returnSelf()); $expectedResult = 'expected'; - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('filter') ->with($templateSubject) ->will($this->returnValue($expectedResult)); $variables = [ 'key' => 'value' ]; - $filterTemplate->expects($this->once()) + $this->filterTemplate->expects($this->once()) ->method('setVariables') ->with(array_merge($variables, ['this' => $model])); $this->assertEquals($expectedResult, $model->getProcessedTemplateSubject($variables)); diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json index 337caab036bcf8efe39b14f1d7d22bf534a38f02..af00cc6e8c40e9b3a163290f4735f76378cbcbd0 100644 --- a/app/code/Magento/Email/composer.json +++ b/app/code/Magento/Email/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-variable": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-variable": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json index 63f7f335ce91ef6b55f722c63265ca6cc57f560a..fb0ea06af950bde812861049560a4f28c9049418 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.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json index 6159ad811b2306d08af85bd45cd0475e3ca56cfe..947f4b38fd94b846103d42917896e0bea3f209eb 100644 --- a/app/code/Magento/GiftMessage/composer.json +++ b/app/code/Magento/GiftMessage/composer.json @@ -3,20 +3,20 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-multishipping": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-multishipping": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json index 5cc77002b47154ceced14a609d6e0d41282926d7..bee379a2e762516b2259c02de46480f235caaad9 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.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json index 09c1724be6bc16c662205bef182abc2a677a37b0..3e9335438799633dbf939e59a055693358b39e4e 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.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-cookie": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-cookie": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json index 97573703a09a74e685922b0b3948f6af8e30aa73..d1aa863fcde98cdaf636287ddcd519d9a3fd53ee 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.74.0-beta14", - "magento/module-google-analytics": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-google-analytics": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GoogleShopping/composer.json b/app/code/Magento/GoogleShopping/composer.json index 1e2387799214e5b48fe356487cc1ea18ce2d030f..8b05adecaf37ca4bcb1ed68f33a1a236d75eaea9 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json index 33a57b24cb7193f6bb5f3b2f0eef591837005946..38e3c029caf0ddf0ef2bb97d829e25f314825335 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.74.0-beta14", - "magento/module-import-export": "0.74.0-beta14", - "magento/module-catalog-import-export": "0.74.0-beta14", - "magento/module-grouped-product": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-import-export": "0.74.0-beta15", + "magento/module-catalog-import-export": "0.74.0-beta15", + "magento/module-grouped-product": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json index 4ee6e8762d9b6760ce1ad74e9978af483e913f0d..6a9998f81ccaf77f4adedcce9c72e3c7f155e104 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/module-msrp": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/module-msrp": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json index e5e58f1eeb8b2d8329b2789124b0a372ca75ef3a..24b773af890d977a1194fe15b9e5fb968a4684c5 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-indexer": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-indexer": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "ext-ctype": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json index 5c2d70fd3ba1f4706522b5534b358eed397bb3d7..ca84f52830f052a60b50bbc295b5ef65a655e629 100644 --- a/app/code/Magento/Indexer/composer.json +++ b/app/code/Magento/Indexer/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json index 71e7696d8ef28184f8fd128d60231cac19b28ca4..91c648dd411685c5025f4a387ba826a5fae64e01 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-user": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-user": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json index 5fb0f54db609de19157dbbe5a22daf6d3025c950..944c003c8403ecd01acd50b480c9371ca243d237 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json index 226458dacc1e2acfe398cfea0d658fb0ec2ab22e..ec04084fa01e1bcf75a405787a4ff23ddba93c29 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.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json index da20bf9f3dc3d8790f4710a3027cbd22335b0d34..0eb5bea42958863eea1b3175863a35c182f790a2 100644 --- a/app/code/Magento/MediaStorage/composer.json +++ b/app/code/Magento/MediaStorage/composer.json @@ -3,14 +3,14 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json index 552af5d5da3518251046821ba504ab4608661fd3..19ff9e0fcb40ef3e710a1f0ef5d2e24a63a66b0b 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.74.0-beta14", - "magento/module-bundle": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-downloadable": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-grouped-product": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-bundle": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-downloadable": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-grouped-product": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json index 3f6d9e22a139d0932d538424871afc49b49baa40..1ab4ff46d8bf15e58386db852e6c4843ae394921 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.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json index 1ac1fb8c9d929acbe852fb2c8c0fa93ee1e42409..ef5f2f74bf54e87f256c5b9d81fece403b531c0e 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.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-email": "0.74.0-beta14", - "magento/module-cron": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-require-js": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-email": "0.74.0-beta15", + "magento/module-cron": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-require-js": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json index 5118d798b7ee7a9f2a5c5f1291afd3a9f9ade93d..952c1c5ac6ced0ac0a4ce024a35bcc5bb4ddd8a5 100644 --- a/app/code/Magento/OfflinePayments/composer.json +++ b/app/code/Magento/OfflinePayments/composer.json @@ -3,13 +3,13 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json index 5a4bc6de203315f49cc562f6c3561279bc5febe8..fc5dadb866578cd97d33d0c093d06fac159545d2 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-sales-rule": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-sales-rule": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json index ce7896f50957edfc63dc32ca1c2b335c880bd0d9..177149ae0507f0740580835e539ed2d580463e07 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json index b78f45d789049bbd5d2a03a892e688dbd0d40535..14ac37fb3841d3b2484bcc845eb6c3a3b007209a 100644 --- a/app/code/Magento/Payment/composer.json +++ b/app/code/Magento/Payment/composer.json @@ -3,16 +3,16 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json index b81c38561e3dfc1e24c9565dec1988e79ff43715..89ec0fa6a5f609f96b50618f6808d0226b64d88b 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.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-cron": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-cron": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json index 715f9607506075b3e7fd70a2f1f691c63f78f3f5..c1b9888b1a664c25cd95cd21c01deb06e3391ab7 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json index 05d09f86f706c1689b7d04bf1f05527d584c2ff2..feb3c2a305eb11d5628536ff6db8c4d4edbd3cdb 100644 --- a/app/code/Magento/Quote/composer.json +++ b/app/code/Magento/Quote/composer.json @@ -3,26 +3,26 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-catalog-rule": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-sales-sequence": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-catalog-rule": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-sales-sequence": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json index 89ac5cea8d624dd0d8c836196cda54c80b9daa21..3cc7e89699a26e62961a8f9d8bccad58fd3bfe80 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-log": "0.74.0-beta14", - "magento/module-wishlist": "0.74.0-beta14", - "magento/module-review": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-downloadable": "0.74.0-beta14", - "magento/module-sales-rule": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-log": "0.74.0-beta15", + "magento/module-wishlist": "0.74.0-beta15", + "magento/module-review": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-downloadable": "0.74.0-beta15", + "magento/module-sales-rule": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json index f36ff58438ce0c1b827ee011308bdf0710623bf6..0fc9194a0947da6360fac6428e4213e1da62e872 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.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json index b8bb07beb0f6fc1ba9a59a47a57b2329e504a074..14feee694679037a59fdcf4e3dca5b6443564732 100644 --- a/app/code/Magento/Review/composer.json +++ b/app/code/Magento/Review/composer.json @@ -3,22 +3,22 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-newsletter": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-newsletter": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-cookie": "0.74.0-beta14" + "magento/module-cookie": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json index ca4231a1f2e5bd6127a2792c31677aca56da011a..0447b0bebdf0cc709578c91ba181a0e77a740623 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json index 5d0a656ebc0bb6db836a97268ddecc99906ad595..c36aaa58007967ca66a23806342c93c98daa4b66 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.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json index e9850b28b5ebbefd68476b14a55a1ea6f8bb63af..e6aa2aa21e933a73bf9e758b74af7541e6b4e447 100644 --- a/app/code/Magento/Sales/composer.json +++ b/app/code/Magento/Sales/composer.json @@ -3,35 +3,35 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-sales-rule": "0.74.0-beta14", - "magento/module-sales-sequence": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-gift-message": "0.74.0-beta14", - "magento/module-reports": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-wishlist": "0.74.0-beta14", - "magento/module-email": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-sales-rule": "0.74.0-beta15", + "magento/module-sales-sequence": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-gift-message": "0.74.0-beta15", + "magento/module-reports": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-wishlist": "0.74.0-beta15", + "magento/module-email": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json index e842b73e7b207cacc55274b6f11cb78df5d008ab..5623e73c6e5030c07a23b41f61470a63eb779210 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-rule": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-reports": "0.74.0-beta14", - "magento/module-catalog-rule": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-rule": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-reports": "0.74.0-beta15", + "magento/module-catalog-rule": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json index 825a8e16713a027df4ea0dd1da8d58e2af16c7ea..00619abdd4ccc375066864103e2f2594e5de9eb7 100644 --- a/app/code/Magento/SalesSequence/composer.json +++ b/app/code/Magento/SalesSequence/composer.json @@ -3,11 +3,11 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json index 98e1ce97eda1a03ced7574846f0a8d0d3efc2722..898482de7d85fbc0c0f4ebba192853c5ac88896a 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog-search": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-reports": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog-search": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-reports": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json index b6712222a0c651e7a30e4186b029c40789fd30ae..9ccd7790f6db459b2bbfb5d2b3016b3d68611ed0 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json index 26e8e039f88d70c2292afe9ffeae4601a4f1ea4a..62cb5208ad210c275d76e2a2c5d639ee489ffd14 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-contact": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-payment": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-contact": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-payment": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "ext-gd": "*", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-fedex": "0.74.0-beta14", - "magento/module-ups": "0.74.0-beta14" + "magento/module-fedex": "0.74.0-beta15", + "magento/module-ups": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json index 6e9cd7ca7d1d8f9a280952fcccdd76c9b45a844c..8f90104dde46560271d479946fbd291437c32623 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.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog-url-rewrite": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog-url-rewrite": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json index 3bb80c7c21ec85900b2c9c7ec5b15ce3a6c99176..a99890e03fc5a37af4abca38b6f045cc7237e1d4 100644 --- a/app/code/Magento/Store/composer.json +++ b/app/code/Magento/Store/composer.json @@ -3,15 +3,15 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-directory": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-directory": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json index b2d4d6faad79318556340971f6dd6d832e89af6c..4318d6c1941543fddb8ac9817117b3680c9399b7 100644 --- a/app/code/Magento/Tax/composer.json +++ b/app/code/Magento/Tax/composer.json @@ -3,24 +3,24 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-config": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-reports": "0.74.0-beta14", - "magento/module-page-cache": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-config": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-reports": "0.74.0-beta15", + "magento/module-page-cache": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json index 2642b8587938955bd7b651a9485560794002064f..36629c619cd0106f03d270e71c8d2662fe7b903a 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-tax": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json index 9fbb0bd754d2cc08791507e25ca35d5d013776d9..a9cd25b0194302174803c3b620111f92b527f530 100644 --- a/app/code/Magento/Theme/composer.json +++ b/app/code/Magento/Theme/composer.json @@ -3,23 +3,23 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-widget": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/module-media-storage": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-require-js": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-widget": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/module-media-storage": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-require-js": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-translation": "0.74.0-beta14" + "magento/module-translation": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json index 7de19b36d8a93d4c6640246a5098e529c27e1860..5c79e40d52acd35b52658273c6d3f8f6a68bd4ae 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.74.0-beta14", - "magento/module-developer": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta15", + "magento/module-developer": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json index 35d8c625925fde44598e7b8524c3e574d51f309e..4138d9f2507c47f012b5ba5972e895932e52ac16 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-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json index 871fbcdc12c1d2a6a3055ac20e0b5370575a5489..8cdcff8d4de70370db4f54d74eae86ba955e7088 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.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json index 24a2772e11a3c6bf97a534c2fa44c09e672e3d6d..fb57d5793c08abd344c9117ef2ccd8aa18ba767a 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.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog-url-rewrite": "0.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-cms-url-rewrite": "0.74.0-beta14", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog-url-rewrite": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-cms-url-rewrite": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json index b16f88f04a4c5b9cec2efb70b688923490d10226..add8cb809cc92db648f94ac35f2f97cdd7ca2467 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.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-integration": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-integration": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json index 59b75138b5be4d8cb021390eec32bc8747c00f8e..290d060ec4f9cc215f324450561911d0afb564b3 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.74.0-beta14", - "magento/module-shipping": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-config": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-shipping": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-config": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "lib-libxml": "*", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json index 58eb8dbd4b6c0be1e41c82dd72972cde940dfe8c..54e469e6183bbf4e4fbf8dc87664bc225cb94203 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.74.0-beta14", - "magento/module-email": "0.74.0-beta14", - "magento/module-store": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-backend": "0.74.0-beta15", + "magento/module-email": "0.74.0-beta15", + "magento/module-store": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json index 07feda54cfd8fcfa810c79f28b9775b8abd4951b..9e21c3965e33e496f65a068a047400cca3a6ffa0 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.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json index 7c018de1b3b051d135d1fe69741e44a94185723c..041ad6295d148297a86c738e3254e8a8709e2937 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.74.0-beta14", - "magento/module-authorization": "0.74.0-beta14", - "magento/module-integration": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-authorization": "0.74.0-beta15", + "magento/module-integration": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-user": "0.74.0-beta14" + "magento/module-user": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json index 7102e797d034a46b70b9724af86c42669e9a8d1b..a6d45896b5d202f3b0cc375979217c7576e0a331 100644 --- a/app/code/Magento/Weee/composer.json +++ b/app/code/Magento/Weee/composer.json @@ -3,21 +3,21 @@ "description": "N/A", "require": { "php": "~5.5.0|~5.6.0", - "magento/module-store": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-tax": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-directory": "0.74.0-beta14", - "magento/module-eav": "0.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-quote": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-tax": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-directory": "0.74.0-beta15", + "magento/module-eav": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-quote": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json index 53ed15c7b6fb5644a930350c0ef7825766161645..bc523c4dfc4fb7ce6cf7f8557171d4150713d5a5 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.74.0-beta14", - "magento/module-cms": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-variable": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-cms": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-variable": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json index 31d183b64bb0ae5cafd1f548adcc4c776cf12132..6420024f7fe65a5009e19b1494cfe23e1470a9ec 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.74.0-beta14", - "magento/module-customer": "0.74.0-beta14", - "magento/module-catalog": "0.74.0-beta14", - "magento/module-checkout": "0.74.0-beta14", - "magento/module-theme": "0.74.0-beta14", - "magento/module-catalog-inventory": "0.74.0-beta14", - "magento/module-rss": "0.74.0-beta14", - "magento/module-backend": "0.74.0-beta14", - "magento/module-sales": "0.74.0-beta14", - "magento/module-grouped-product": "0.74.0-beta14", - "magento/framework": "0.74.0-beta14", - "magento/module-ui": "0.74.0-beta14", + "magento/module-store": "0.74.0-beta15", + "magento/module-customer": "0.74.0-beta15", + "magento/module-catalog": "0.74.0-beta15", + "magento/module-checkout": "0.74.0-beta15", + "magento/module-theme": "0.74.0-beta15", + "magento/module-catalog-inventory": "0.74.0-beta15", + "magento/module-rss": "0.74.0-beta15", + "magento/module-backend": "0.74.0-beta15", + "magento/module-sales": "0.74.0-beta15", + "magento/module-grouped-product": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", + "magento/module-ui": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "suggest": { - "magento/module-configurable-product": "0.74.0-beta14", - "magento/module-downloadable": "0.74.0-beta14", - "magento/module-bundle": "0.74.0-beta14", - "magento/module-cookie": "0.74.0-beta14" + "magento/module-configurable-product": "0.74.0-beta15", + "magento/module-downloadable": "0.74.0-beta15", + "magento/module-bundle": "0.74.0-beta15", + "magento/module-cookie": "0.74.0-beta15" }, "type": "magento2-module", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "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 a635d2f6368d6f8d066d468efc7a6056820e06e4..994aa5c930a775f5a3ec975cc75a335cb5d605c1 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.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "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 e715b5304c3a39ca06f52c98c37a438a68cf839d..72d53a5c015e815232790bc9b4f1adbc0c796104 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.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "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 011484f9abf79fb35ffa25a064e3debc221029ee..24dde37d5609594df501e8d9b0f026b86028789c 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.74.0-beta14", - "magento/framework": "0.74.0-beta14", + "magento/theme-frontend-blank": "0.74.0-beta15", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-theme", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/app/i18n/magento/de_de/composer.json b/app/i18n/magento/de_de/composer.json index 752d5584e51535511fc382bd1edfad901affa4fd..3e9d723ba1e9571b8ea58bb261587566375e1923 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 4feb2ced23f3e909170d222c43410ff08edc5cd7..8743ec39e77badf5d2ddce2850899dcc9cd19d58 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 c2a70d39babadc84b11b03652e750d590ffd15fa..9f039e8e7f96eee37f839065ad7d055c8b7acd90 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 b6c40d9c8fa9be5d193c4f81534ab9cf0bebdd89..89b782484baffebf357f63c56b5ad5e437e07a1f 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 c905b708215fd32745c8c1313fca3649c31f4c7c..01ab7abdb18c0487f89b02cb327e418818f2d7f8 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 4f80afff03c0adbfab31185741fdb201c6391b50..a52d0be442954404ec0fd3ab5c2105df23bb6c4e 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "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 63c14d0af900801962fcaa32f179cf375fa451f9..f2b0c7803c9498a07dbfe603b8a58fcee58118a0 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" ], "require": { - "magento/framework": "0.74.0-beta14", + "magento/framework": "0.74.0-beta15", "magento/magento-composer-installer": "*" }, "type": "magento2-language", diff --git a/composer.json b/composer.json index de38e5f9054eaa949f908c24667d2eca249f0c4b..46f9532c0fc0c658a6857a6cbc3e639d34d92075 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/magento2ce", "description": "Magento 2 (Community Edition)", "type": "project", - "version": "0.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0" diff --git a/composer.lock b/composer.lock index ad898f081b37863b7058659247c2f9facb8c4a70..3edd20fd60b9ab37eebc62bb027fb7d6f8ab8691 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "abd337bce9c7d09a56c1c40b3d2e4092", + "hash": "0c8183878a902922b635912a4ca71bdd", "packages": [ { "name": "composer/composer", @@ -1757,18 +1757,21 @@ "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030" + "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cf05c5ba75606e47ffee91cedc72778da46f74c3", - "reference": "eab586f4c18af3fa63c977611939f1f4a3cf1030", + "reference": "cf05c5ba75606e47ffee91cedc72778da46f74c3", "shasum": "" }, "require": { "php": ">=5.3.23" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-eventmanager": "self.version", "zendframework/zend-filter": "self.version", "zendframework/zend-serializer": "self.version", @@ -1789,19 +1792,19 @@ }, "autoload": { "psr-4": { - "Zend\\Stdlib\\": "" + "Zend\\Stdlib\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-stdlib", "keywords": [ "stdlib", "zf2" ], - "time": "2015-04-01 18:09:29" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-text", @@ -1894,12 +1897,12 @@ "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "eb678d20256f120a72ca27276bbb2875841701ab" + "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/45fac2545a0f2eb66d71cb7966feee481e7c475f", - "reference": "eb678d20256f120a72ca27276bbb2875841701ab", + "reference": "45fac2545a0f2eb66d71cb7966feee481e7c475f", "shasum": "" }, "require": { @@ -1907,6 +1910,9 @@ "zendframework/zend-stdlib": "self.version" }, "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "satooshi/php-coveralls": "dev-master", "zendframework/zend-db": "self.version", "zendframework/zend-filter": "self.version", "zendframework/zend-i18n": "self.version", @@ -1934,7 +1940,7 @@ }, "autoload": { "psr-4": { - "Zend\\Validator\\": "" + "Zend\\Validator\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1942,12 +1948,12 @@ "BSD-3-Clause" ], "description": "provides a set of commonly needed validators", - "homepage": "https://github.com/zendframework/zf2", + "homepage": "https://github.com/zendframework/zend-validator", "keywords": [ "validator", "zf2" ], - "time": "2015-04-01 18:09:30" + "time": "2015-03-25 20:55:48" }, { "name": "zendframework/zend-view", diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php index fb61d6803b3681c56a7af5ad3a29cc8468484e27..76de8c573539c2d3a51ba2c7275525fc78100f03 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.74.0-beta14'; + const VERSION = '0.74.0-beta15'; /** * Launch application diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php index 50db67715c20e9c3dd1adaea1bbb8e98a181cb4e..5c6fede1d57b6cf4f5a0faeaebec9360322bbf1d 100644 --- a/lib/internal/Magento/Framework/Filter/Template.php +++ b/lib/internal/Magento/Framework/Filter/Template.php @@ -32,13 +32,6 @@ class Template implements \Zend_Filter_Interface */ protected $_templateVars = []; - /** - * Include processor - * - * @var callable|null - */ - protected $_includeProcessor = null; - /** * @var \Magento\Framework\Stdlib\String */ @@ -68,28 +61,6 @@ class Template implements \Zend_Filter_Interface return $this; } - /** - * Sets the processor of includes. - * - * @param callable $callback it must return string - * @return $this - */ - public function setIncludeProcessor(array $callback) - { - $this->_includeProcessor = $callback; - return $this; - } - - /** - * Sets the processor of includes. - * - * @return callable|null - */ - public function getIncludeProcessor() - { - return is_callable($this->_includeProcessor) ? $this->_includeProcessor : null; - } - /** * Filter the string as template. * @@ -153,27 +124,6 @@ class Template implements \Zend_Filter_Interface return $replacedValue; } - /** - * @param string[] $construction - * @return mixed - */ - public function includeDirective($construction) - { - // Processing of {include template=... [...]} statement - $includeParameters = $this->_getIncludeParameters($construction[2]); - if (!isset($includeParameters['template']) or !$this->getIncludeProcessor()) { - // Not specified template or not set include processor - $replacedValue = '{Error in include processing}'; - } else { - // Including of template - $templateCode = $includeParameters['template']; - unset($includeParameters['template']); - $includeParameters = array_merge_recursive($includeParameters, $this->_templateVars); - $replacedValue = call_user_func($this->getIncludeProcessor(), $templateCode, $includeParameters); - } - return $replacedValue; - } - /** * @param string[] $construction * @return string diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json index 29ca6222b30be7c45122ac19c9f1c48c04c408fc..65ab1eb321eb7010afe26da3948acb78c93bdb01 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.74.0-beta14", + "version": "0.74.0-beta15", "license": [ "OSL-3.0", "AFL-3.0"