From 02a9a0eafe3cb8b07988721e8c221627d2fb7dc9 Mon Sep 17 00:00:00 2001 From: mage2-team Date: Tue, 18 Nov 2014 06:12:45 -0800 Subject: [PATCH] 0.1.0-alpha104 * Various improvements: * Merge SQL and Data Upgrades for the Sales and SalesRule modules * Add getDefaultBilling and getDefaultShipping to Customer Interface * Stabilized the Bundle module * Stabilized the CatalogSearch module * Stabilized the Cms module * Stabilized the SalesRule module * Performance improvements: * Introduced CatalogRule indexers based on Mview * Significantly decreased the amount of unused objects, mostly in category and product view scenarios: * Got rid of non-shared indexer instances all over the code introducing Magento\Indexer\Model\IndexerRegistry * Magento\Catalog\Pricing\Price\BasePrice being created on demand only, instead of unconditioned creation in constructor * Created proxies for unused objects with big amount of dependencies * Fixed \Magento\Review\Block\Product\Review block which injected backend block context by mistake * A customer model in \Magento\Customer\Model\Layout\DepersonalizePlugin being created on demand only, instead of constructor * Introduced caching for product attribute metadata loading procedure * Improved SavePayment Checkout step to save only payment related data * Speed up all Checkout steps of the One Page Checkout * Updated the benchmark.jmx jmeter script in the performance toolkit * Fixed bugs: * Fixed an issue where performance toolkit generator created Products/Categories without URL rewrites due to install area elimination * Fixed an issue where the Custom Options fieldset on Product Information page was collapsible * Fixed an issue where the Base URL was added to target path for Custom UrlRewrite * Fixed an issue where an invalid Cross-sells amount was displayed in the Shopping Cart * Fixed an issue where the Mage_Catalog_Model_Product_Type_AbstractTest::testBeforeSave integration test failed when Mage_Downloadable module was not available * Fixed an issue where the custom URL rewrite redirected to sub-folder when Request Path contained slash * Fixed an issue where it was impossible to place an order if registering during checkout * Fixed an issue where there was no possibility to save default billing and shipping addresses for customer on the store front * Fixed an issue where a widget of Catalog Category Link type was not displayed on the store front * Fixed an issue where the Versions tab was absent on the CMS page with version control * Fixed an issue where it was impossible to insert Widgets and Images to a CMS page * Added the following functional tests: * Create widget * Print order from guest on frontend * Framework Improvements: * Removed duplicated logic from API Builders and Builder generators. Added support for populating builders from the objects, implementing data interface * Processed GitHub requests: * [#674](https://github.com/magento/magento2/issues/674) -- Widgets in content pages --- .gitignore | 4 + CHANGELOG.md | 41 + README.md | 84 +- .../Magento/AdminNotification/composer.json | 10 +- app/code/Magento/Authorization/composer.json | 6 +- app/code/Magento/Authorizenet/composer.json | 18 +- app/code/Magento/Authorizenet/etc/module.xml | 2 +- app/code/Magento/Backend/composer.json | 34 +- app/code/Magento/Backup/composer.json | 12 +- .../Magento/Bundle/Model/Resource/Bundle.php | 4 +- .../Bundle/Pricing/Price/ConfiguredPrice.php | 2 +- .../Bundle/Pricing/Price/FinalPrice.php | 3 +- app/code/Magento/Bundle/composer.json | 30 +- app/code/Magento/Captcha/composer.json | 14 +- .../Magento/Catalog/Block/Widget/Link.php | 11 +- .../Product/Action/Attribute/Save.php | 1 + .../Controller/Adminhtml/Product/Save.php | 2 - .../Attribute/Backend/Customlayoutupdate.php | 4 +- app/code/Magento/Catalog/Model/Category.php | 72 +- .../Category/Attribute/Backend/Image.php | 7 +- .../Category/Attribute/Backend/Sortby.php | 4 +- app/code/Magento/Catalog/Model/Config.php | 4 +- .../Model/Indexer/AbstractFlatState.php | 32 +- .../Catalog/Model/Indexer/Category/Flat.php | 20 +- .../Category/Flat/Plugin/StoreGroup.php | 27 +- .../Category/Flat/System/Config/Mode.php | 24 +- .../Model/Indexer/Category/Product.php | 18 +- .../Category/Product/Plugin/StoreGroup.php | 27 +- .../Model/Indexer/Product/Category.php | 6 +- .../Catalog/Model/Indexer/Product/Eav.php | 2 +- .../Catalog/Model/Indexer/Product/Flat.php | 2 +- .../Model/Indexer/Product/Flat/Processor.php | 8 +- .../Model/Indexer/Product/Flat/State.php | 9 +- .../Catalog/Model/Indexer/Product/Price.php | 2 +- .../Product/Price/Plugin/AbstractPlugin.php | 27 +- .../Price/System/Config/PriceScope.php | 15 +- app/code/Magento/Catalog/Model/Product.php | 32 +- .../Magento/Catalog/Model/Product/Action.php | 37 +- .../Product/Attribute/Backend/Groupprice.php | 4 +- .../Backend/Groupprice/AbstractGroupprice.php | 4 +- .../Model/Product/Attribute/Backend/Media.php | 3 - .../Model/Product/Attribute/Backend/Price.php | 3 - .../Model/Product/Attribute/Backend/Sku.php | 4 +- .../Product/Attribute/Backend/Startdate.php | 4 +- .../Model/Product/Attribute/Backend/Stock.php | 8 +- .../Product/Attribute/Backend/Tierprice.php | 4 +- .../Catalog/Model/Resource/Category.php | 24 +- .../Catalog/Model/Resource/Category/Tree.php | 38 +- .../Magento/Catalog/Model/Resource/Config.php | 13 +- .../Product/Attribute/Backend/Image.php | 3 - .../Model/Resource/Product/Collection.php | 34 - .../Catalog/Plugin/Model/Resource/Config.php | 103 ++ .../Catalog/Pricing/Price/FinalPrice.php | 31 +- .../Service/V1/Data/CategoryBuilder.php | 6 +- .../V1/Data/Eav/AttributeMetadataBuilder.php | 6 +- .../Eav/Category/Info/MetadataBuilder.php | 6 +- .../Attribute/SearchResultsBuilder.php | 6 +- .../V1/Data/Product/SearchResultsBuilder.php | 6 +- .../Service/V1/Data/ProductBuilder.php | 6 +- .../Data/Option/MetadataBuilder.php | 6 +- .../Product/Link/Data/ProductLinkBuilder.php | 6 +- app/code/Magento/Catalog/composer.json | 48 +- app/code/Magento/Catalog/etc/di.xml | 64 +- .../catalog/product/edit/options.phtml | 6 +- .../Model/Import/Product.php | 23 +- .../Magento/CatalogImportExport/composer.json | 20 +- .../CatalogInventory/Model/Indexer/Stock.php | 2 +- .../CatalogInventory/Model/Observer.php | 1 + .../Service/V1/StockItemService.php | 2 +- .../Magento/CatalogInventory/composer.json | 20 +- .../CatalogRuleException.php} | 13 +- .../Adminhtml/Promo/Catalog/ApplyRules.php | 1 + .../Adminhtml/Promo/Catalog/Delete.php | 1 + app/code/Magento/CatalogRule/Model/Cron.php | 54 ++ .../Model/Indexer/AbstractIndexer.php | 112 +++ .../Model/Indexer/IndexBuilder.php | 706 ++++++++++++++ .../Indexer/Product/ProductRuleIndexer.php | 20 +- .../Indexer/Product/ProductRuleProcessor.php} | 17 +- .../Model/Indexer/Rule/RuleProductIndexer.php | 27 +- .../Indexer/Rule/RuleProductProcessor.php} | 16 +- .../Magento/CatalogRule/Model/Observer.php | 228 +---- .../CatalogRule/Model/Resource/Rule.php | 626 +----------- app/code/Magento/CatalogRule/Model/Rule.php | 43 - .../Model/Rule/Condition/Combine.php | 1 + .../Magento/CatalogRule/Model/Rule/Job.php | 18 +- .../CatalogRule/Plugin/Indexer/Category.php | 77 ++ .../Plugin/Indexer/CustomerGroup.php | 58 ++ .../Plugin/Indexer/ImportExport.php | 58 ++ .../Plugin/Indexer/Product/Attribute.php | 158 +++ .../Plugin/Indexer/Product/PriceIndexer.php} | 74 +- .../Indexer/Product/Save/ApplyRules.php | 62 ++ .../CatalogRule/Plugin/Indexer/Website.php | 59 ++ app/code/Magento/CatalogRule/composer.json | 18 +- .../Magento/CatalogRule/etc/adminhtml/di.xml | 18 + .../CatalogRule/etc/adminhtml/events.xml | 15 - app/code/Magento/CatalogRule/etc/crontab.xml | 2 +- app/code/Magento/CatalogRule/etc/di.xml | 5 +- app/code/Magento/CatalogRule/etc/events.xml | 3 - app/code/Magento/CatalogRule/etc/indexer.xml | 35 + app/code/Magento/CatalogRule/etc/module.xml | 2 + app/code/Magento/CatalogRule/etc/mview.xml | 47 + .../upgrade-1.6.0.3-1.6.0.4.php | 57 ++ .../Model/Config/Backend/Search/Type.php | 20 +- .../CatalogSearch/Model/Indexer/Fulltext.php | 16 +- .../Fulltext/Plugin/AbstractPlugin.php | 35 +- .../Indexer/Fulltext/Plugin/Attribute.php | 6 +- .../Indexer/Fulltext/Plugin/Store/Group.php | 6 +- .../Indexer/Fulltext/Plugin/Store/View.php | 7 +- app/code/Magento/CatalogSearch/composer.json | 24 +- app/code/Magento/CatalogSearch/etc/di.xml | 5 - .../Magento/CatalogUrlRewrite/composer.json | 18 +- app/code/Magento/Centinel/composer.json | 14 +- app/code/Magento/Centinel/etc/module.xml | 2 +- .../Magento/Checkout/Model/Resource/Cart.php | 8 +- .../Magento/Checkout/Model/Type/Onepage.php | 10 +- .../Service/V1/Data/Cart/AddressBuilder.php | 6 +- .../Service/V1/Data/Cart/Totals/Item.php | 2 +- .../V1/Data/CartSearchResultsBuilder.php | 6 +- app/code/Magento/Checkout/composer.json | 36 +- .../Magento/CheckoutAgreements/composer.json | 10 +- .../Cms/Ui/DataProvider/Page/Row/Actions.php | 2 +- app/code/Magento/Cms/composer.json | 20 +- .../layout/cms_wysiwyg_images_index.xml | 20 +- app/code/Magento/CmsUrlRewrite/composer.json | 8 +- .../ConfigurableImportExport/composer.json | 14 +- .../Magento/ConfigurableProduct/composer.json | 28 +- app/code/Magento/Contact/composer.json | 12 +- app/code/Magento/Core/composer.json | 16 +- app/code/Magento/Cron/composer.json | 8 +- app/code/Magento/CurrencySymbol/composer.json | 14 +- .../Api/AccountManagementInterface.php | 21 + .../Customer/Api/Data/AddressInterface.php | 16 + .../Magento/Customer/Block/Address/Edit.php | 3 +- .../Customer/Controller/Account/Edit.php | 3 +- .../Customer/Controller/Address/FormPost.php | 2 + .../Customer/Model/AccountManagement.php | 42 +- app/code/Magento/Customer/Model/Address.php | 4 + .../Customer/Attribute/Backend/Password.php | 4 +- .../Customer/Attribute/Backend/Store.php | 4 +- .../Customer/Attribute/Backend/Website.php | 4 +- .../Magento/Customer/Model/Data/Address.php | 20 + .../Customer/Model/Data/CustomerBuilder.php | 6 +- .../Model/Layout/DepersonalizePlugin.php | 9 +- .../Address/Attribute/Backend/Region.php | 4 +- .../Model/Resource/AddressRepository.php | 3 + .../Model/Resource/CustomerRepository.php | 1 - .../Service/V1/Data/AddressBuilder.php | 6 +- .../Service/V1/Data/CustomerBuilder.php | 10 +- .../V1/Data/CustomerDetailsBuilder.php | 6 +- .../CustomerGroupSearchResultsBuilder.php | 6 +- .../V1/Data/Eav/AttributeMetadataBuilder.php | 6 +- .../Service/V1/Data/SearchResultsBuilder.php | 6 +- app/code/Magento/Customer/composer.json | 36 +- app/code/Magento/Customer/etc/di.xml | 10 +- .../CustomerImportExport/composer.json | 16 +- app/code/Magento/DesignEditor/composer.json | 14 +- app/code/Magento/Dhl/composer.json | 22 +- ...all-2.0.0.0.php => data-install-2.0.0.php} | 0 app/code/Magento/Dhl/etc/module.xml | 2 +- app/code/Magento/Directory/composer.json | 10 +- .../Magento/Downloadable/Model/Observer.php | 34 +- app/code/Magento/Downloadable/composer.json | 34 +- .../downloadable_setup/install-1.6.0.0.php | 8 +- app/code/Magento/Eav/Model/Config.php | 272 ++---- .../Attribute/Backend/AbstractBackend.php | 13 - .../Entity/Attribute/Backend/Datetime.php | 4 +- .../Model/Entity/Attribute/Backend/Store.php | 4 +- .../Entity/Attribute/Backend/Time/Created.php | 4 +- .../Entity/Attribute/Backend/Time/Updated.php | 4 +- app/code/Magento/Eav/Model/Entity/Type.php | 10 - .../Eav/Model/Resource/Entity/Attribute.php | 22 - .../Model/Resource/Entity/Attribute.php | 80 ++ app/code/Magento/Eav/composer.json | 12 +- app/code/Magento/Eav/etc/di.xml | 3 + app/code/Magento/Email/composer.json | 12 +- app/code/Magento/Fedex/composer.json | 18 +- ...all-2.0.0.0.php => data-install-2.0.0.php} | 0 app/code/Magento/Fedex/etc/module.xml | 2 +- app/code/Magento/GiftMessage/composer.json | 22 +- app/code/Magento/GoogleAdwords/composer.json | 8 +- .../Magento/GoogleAnalytics/composer.json | 8 +- .../Magento/GoogleOptimizer/composer.json | 14 +- app/code/Magento/GoogleShopping/composer.json | 20 +- .../Magento/GroupedImportExport/composer.json | 14 +- app/code/Magento/GroupedProduct/composer.json | 24 +- .../Magento/ImportExport/Model/Import.php | 25 +- app/code/Magento/ImportExport/composer.json | 14 +- .../Adminhtml/Indexer/MassChangelog.php | 8 +- .../Adminhtml/Indexer/MassOnTheFly.php | 8 +- .../Magento/Indexer/Model/ActionInterface.php | 2 +- .../Model/Indexer/AbstractProcessor.php | 17 +- .../Magento/Indexer/Model/IndexerRegistry.php | 60 ++ app/code/Magento/Indexer/composer.json | 8 +- app/code/Magento/Integration/composer.json | 16 +- .../Magento/LayeredNavigation/composer.json | 8 +- app/code/Magento/Log/composer.json | 14 +- app/code/Magento/Msrp/composer.json | 24 +- app/code/Magento/Multishipping/composer.json | 20 +- app/code/Magento/Newsletter/composer.json | 22 +- .../Magento/OfflinePayments/composer.json | 6 +- .../Magento/OfflinePayments/etc/module.xml | 2 +- .../Magento/OfflineShipping/composer.json | 20 +- .../Magento/OfflineShipping/etc/module.xml | 2 +- ...{install-2.0.0.0.php => install-2.0.0.php} | 8 +- app/code/Magento/Ogone/composer.json | 12 +- ...all-1.6.0.0.php => data-install-2.0.0.php} | 0 app/code/Magento/Ogone/etc/module.xml | 2 +- app/code/Magento/PageCache/composer.json | 8 +- .../PayPalRecurringPayment/composer.json | 16 +- .../PayPalRecurringPayment/etc/module.xml | 2 +- app/code/Magento/Payment/Model/Info.php | 8 +- app/code/Magento/Payment/composer.json | 14 +- app/code/Magento/Payment/etc/module.xml | 2 +- .../Magento/Paypal/Model/Api/AbstractApi.php | 2 +- app/code/Magento/Paypal/composer.json | 30 +- ...all-1.6.0.0.php => data-install-2.0.0.php} | 6 +- .../data-upgrade-1.6.0.2-1.6.0.3.php | 38 - app/code/Magento/Paypal/etc/module.xml | 2 +- ...{install-1.6.0.0.php => install-2.0.0.php} | 57 +- .../paypal_setup/upgrade-1.6.0.0-1.6.0.1.php | 68 -- app/code/Magento/Persistent/composer.json | 16 +- .../Magento/Persistent/etc/frontend/di.xml | 5 + .../sql/persistent_setup/install-1.0.0.0.php | 4 +- app/code/Magento/ProductAlert/composer.json | 12 +- .../Magento/RecurringPayment/composer.json | 26 +- ...all-1.0.0.0.php => data-install-2.0.0.php} | 0 .../RecurringPayment/etc/frontend/di.xml | 32 + .../Magento/RecurringPayment/etc/module.xml | 2 +- ...{install-1.0.0.0.php => install-2.0.0.php} | 4 +- .../Model/Resource/Customer/Collection.php | 4 +- .../Model/Resource/Order/Collection.php | 6 +- .../Model/Resource/Product/Collection.php | 14 +- .../Model/Resource/Quote/Collection.php | 4 +- app/code/Magento/Reports/composer.json | 36 +- app/code/Magento/RequireJs/composer.json | 4 +- .../Magento/Review/Block/Product/Review.php | 4 +- app/code/Magento/Review/composer.json | 22 +- app/code/Magento/Rss/composer.json | 10 +- .../Magento/Rule/Model/Condition/Combine.php | 47 +- .../Condition/Product/AbstractProduct.php | 36 +- .../Rule/Model/Condition/Sql/Builder.php | 3 +- .../Magento/Rule/Model/ConditionFactory.php | 36 +- app/code/Magento/Rule/composer.json | 12 +- .../Magento/Sales/Model/AdminOrder/Create.php | 8 +- .../Frontend/Quote/Address/CollectTotals.php | 2 +- app/code/Magento/Sales/Model/Quote.php | 19 +- .../Magento/Sales/Model/Quote/Payment.php | 15 +- .../Sales/Model/Resource/AbstractGrid.php | 4 +- .../Magento/Sales/Model/Resource/Order.php | 4 +- .../Sales/Model/Resource/Order/Address.php | 2 +- .../Sales/Model/Resource/Order/Collection.php | 4 +- .../Sales/Model/Resource/Order/Creditmemo.php | 2 +- .../Resource/Order/Creditmemo/Comment.php | 2 +- .../Model/Resource/Order/Creditmemo/Grid.php | 4 +- .../Order/Creditmemo/Grid/Collection.php | 2 +- .../Model/Resource/Order/Creditmemo/Item.php | 2 +- .../Sales/Model/Resource/Order/Grid.php | 2 +- .../Model/Resource/Order/Grid/Collection.php | 2 +- .../Sales/Model/Resource/Order/Invoice.php | 2 +- .../Model/Resource/Order/Invoice/Comment.php | 2 +- .../Model/Resource/Order/Invoice/Grid.php | 4 +- .../Order/Invoice/Grid/Collection.php | 2 +- .../Model/Resource/Order/Invoice/Item.php | 2 +- .../Sales/Model/Resource/Order/Item.php | 2 +- .../Sales/Model/Resource/Order/Payment.php | 2 +- .../Resource/Order/Payment/Transaction.php | 2 +- .../Order/Payment/Transaction/Collection.php | 4 +- .../Model/Resource/Order/Rss/OrderStatus.php | 8 +- .../Sales/Model/Resource/Order/Shipment.php | 2 +- .../Model/Resource/Order/Shipment/Comment.php | 2 +- .../Model/Resource/Order/Shipment/Grid.php | 4 +- .../Order/Shipment/Grid/Collection.php | 2 +- .../Model/Resource/Order/Shipment/Item.php | 2 +- .../Model/Resource/Order/Shipment/Track.php | 2 +- .../Sales/Model/Resource/Order/Status.php | 2 +- .../Model/Resource/Order/Status/History.php | 2 +- .../Magento/Sales/Model/Resource/Quote.php | 16 +- .../Sales/Model/Resource/Quote/Address.php | 2 +- .../Address/Attribute/Backend/Region.php | 4 +- .../Model/Resource/Quote/Address/Item.php | 2 +- .../Model/Resource/Quote/Address/Rate.php | 2 +- .../Sales/Model/Resource/Quote/Item.php | 2 +- .../Model/Resource/Quote/Item/Option.php | 2 +- .../Sales/Model/Resource/Quote/Payment.php | 2 +- .../Model/Resource/Report/Bestsellers.php | 8 +- .../Sales/Model/Resource/Report/Invoiced.php | 6 +- .../Model/Resource/Report/Order/Createdat.php | 8 +- .../Sales/Model/Resource/Report/Refunded.php | 6 +- .../Sales/Model/Resource/Report/Shipping.php | 6 +- .../Magento/Sales/Model/Resource/Setup.php | 50 +- app/code/Magento/Sales/composer.json | 44 +- ...all-1.6.0.0.php => data-install-2.0.0.php} | 37 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 71 -- .../data-upgrade-1.6.0.5-1.6.0.6.php | 42 - app/code/Magento/Sales/etc/module.xml | 2 +- ...{install-1.6.0.0.php => install-2.0.0.php} | 901 ++++++++++-------- .../sales_setup/upgrade-1.6.0.0-1.6.0.1.php | 37 - .../sales_setup/upgrade-1.6.0.1-1.6.0.2.php | 33 - .../sales_setup/upgrade-1.6.0.11-1.6.0.12.php | 41 - .../sales_setup/upgrade-1.6.0.3-1.6.0.4.php | 37 - .../sales_setup/upgrade-1.6.0.4-1.6.0.5.php | 56 -- .../sales_setup/upgrade-1.6.0.6-1.6.0.7.php | 37 - .../sales_setup/upgrade-1.6.0.7-1.6.0.8.php | 40 - .../sales_setup/upgrade-1.6.0.8-1.6.0.9.php | 51 - .../Model/Resource/Report/Rule/Createdat.php | 2 +- app/code/Magento/SalesRule/composer.json | 34 +- ...0.3-1.6.0.4.php => data-install-2.0.0.php} | 0 app/code/Magento/SalesRule/etc/module.xml | 2 +- ...{install-1.6.0.0.php => install-2.0.0.php} | 282 ++++-- .../upgrade-1.6.0.1-1.6.0.2.php | 118 --- .../upgrade-1.6.0.2-1.6.0.3.php | 135 --- app/code/Magento/Search/composer.json | 8 +- app/code/Magento/Sendfriend/composer.json | 14 +- app/code/Magento/Shipping/composer.json | 26 +- app/code/Magento/Shipping/etc/module.xml | 2 +- app/code/Magento/Sitemap/composer.json | 18 +- app/code/Magento/Store/composer.json | 10 +- .../Model/Resource/Report/Tax/Createdat.php | 6 +- .../V1/Data/OrderTaxDetails/ItemBuilder.php | 6 +- .../V1/Data/OrderTaxDetailsBuilder.php | 6 +- .../V1/Data/QuoteDetails/ItemBuilder.php | 6 +- .../Service/V1/Data/QuoteDetailsBuilder.php | 6 +- .../V1/Data/TaxClassSearchResultsBuilder.php | 6 +- .../V1/Data/TaxDetails/AppliedTaxBuilder.php | 6 +- .../V1/Data/TaxDetails/ItemBuilder.php | 6 +- .../Tax/Service/V1/Data/TaxDetailsBuilder.php | 6 +- .../Tax/Service/V1/Data/TaxRateBuilder.php | 6 +- .../V1/Data/TaxRateSearchResultsBuilder.php | 6 +- .../Tax/Service/V1/Data/TaxRuleBuilder.php | 6 +- .../V1/Data/TaxRuleSearchResultsBuilder.php | 6 +- app/code/Magento/Tax/composer.json | 28 +- app/code/Magento/Tax/etc/frontend/di.xml | 34 + .../sql/tax_setup/upgrade-1.6.0.1-1.6.0.2.php | 4 +- .../sql/tax_setup/upgrade-1.6.0.6-1.6.0.7.php | 4 +- .../Magento/TaxImportExport/composer.json | 12 +- app/code/Magento/Theme/composer.json | 16 +- app/code/Magento/Theme/etc/di.xml | 1 - app/code/Magento/Theme/etc/module.xml | 2 +- app/code/Magento/Translation/composer.json | 10 +- app/code/Magento/Ui/composer.json | 8 +- app/code/Magento/Ui/etc/module.xml | 6 +- app/code/Magento/Ups/composer.json | 18 +- app/code/Magento/Ups/etc/module.xml | 2 +- .../Controller/Adminhtml/Url/Rewrite/Save.php | 2 +- .../Magento/UrlRewrite/Controller/Router.php | 34 +- app/code/Magento/UrlRewrite/composer.json | 18 +- app/code/Magento/User/composer.json | 14 +- app/code/Magento/Usps/composer.json | 18 +- ...all-2.0.0.0.php => data-install-2.0.0.php} | 0 app/code/Magento/Usps/etc/module.xml | 2 +- .../Controller/ServiceArgsSerializer.php | 8 +- app/code/Magento/Webapi/composer.json | 16 +- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 4 +- app/code/Magento/Weee/composer.json | 24 +- app/code/Magento/Widget/composer.json | 14 +- app/code/Magento/Wishlist/composer.json | 32 +- .../adminhtml/Magento/backend/composer.json | 4 +- .../adminhtml/Magento/backend/theme.xml | 2 +- .../frontend/Magento/blank/composer.json | 4 +- app/design/frontend/Magento/blank/theme.xml | 2 +- .../frontend/Magento/plushe/composer.json | 6 +- app/design/frontend/Magento/plushe/theme.xml | 2 +- app/etc/di.xml | 1 - app/i18n/magento/de_de/composer.json | 4 +- app/i18n/magento/en_us/composer.json | 4 +- app/i18n/magento/es_es/composer.json | 4 +- app/i18n/magento/fr_fr/composer.json | 4 +- app/i18n/magento/nl_nl/composer.json | 4 +- app/i18n/magento/pt_br/composer.json | 4 +- app/i18n/magento/zh_cn/composer.json | 4 +- composer.json | 2 +- .../Selenium/Element/ConditionsElement.php | 24 +- .../Test/Block/Catalog/Product/View.php | 2 +- .../AssertTierPriceOnBundleProductPage.php | 4 +- .../Test/Page/Product/CatalogProductView.xml | 5 + .../Test/TestCase/BundleDynamicTest.php | 5 +- .../Bundle/Test/TestCase/BundleFixedTest.php | 3 +- .../Edit/Tab/ProductDetails/CategoryIds.php | 2 +- .../ProductDetails/ProductOnlineSwitcher.php | 9 + .../Catalog/Test/Block/Category/View.php | 35 +- .../Page/Category/CatalogCategoryView.xml | 5 + .../Page/Product/CatalogProductCompare.xml | 5 + .../Test/Page/Product/CatalogProductView.xml | 5 + .../Test/Repository/CatalogProductSimple.php | 7 +- .../Test/Handler/CatalogSearchQuery/Curl.php | 20 +- .../Test/Page/Adminhtml/CatalogSearchEdit.xml | 2 +- .../Page/Adminhtml/CatalogSearchIndex.xml | 4 +- .../Test/Page/AdvancedSearch.xml | 5 + .../TestCase/AdvancedSearchEntityTest.php | 4 +- .../{testSearch.csv => test.csv} | 26 +- .../EditSearchTermEntityTest/test.csv | 2 +- .../Magento/CatalogSearch/Test/etc/page.xml | 4 +- .../app/Magento/Checkout/Test/etc/fixture.xml | 2 +- .../app/Magento/Cms/Test/Page/CmsIndex.xml | 5 + ...figurableAttributesAbsentOnProductPage.php | 8 +- ...leAttributesBlockIsAbsentOnProductPage.php | 6 +- .../AssertConfigurableProductForm.php | 5 + .../Test/TestStep/SetupConfigurationStep.php | 7 +- .../Customer/Test/Block/Address/Renderer.php | 28 +- .../CheckoutData.php | 10 + ...AssertGroupedProductInItemsOrderedGrid.php | 10 +- .../Block/Customer/Wishlist/Items/Product.php | 19 + .../AssertProductDetailsInWishlist.php | 11 +- ...CartFromCustomerWishlistOnFrontendTest.php | 1 + ...roductInCustomerWishlistOnFrontendTest.php | 1 + .../Test/TestCase/ShareWishlistEntityTest.php | 1 + .../Model/Product/Type/AbstractTest.php | 11 +- ...roduct_attribute_with_invalid_apply_to.php | 49 + .../Model/Indexer/IndexerBuilderTest.php | 126 +++ .../Model/Indexer/ProductRuleTest.php | 65 ++ .../Model/Indexer/RuleProductTest.php | 76 ++ .../Magento/CatalogRule/_files/attribute.php | 53 ++ .../_files/catalog_rule_10_off_not_logged.php | 5 +- .../CatalogRule/_files/rule_by_attribute.php | 40 +- .../Adminhtml/Wysiwyg/Images/IndexTest.php | 23 +- .../Customer/Block/Widget/TaxvatTest.php | 7 + .../Customer/Controller/AddressTest.php | 6 +- .../Customer/Model/AccountManagementTest.php | 129 ++- .../V1/Data/CustomerDetailsBuilderTest.php | 5 +- .../Data/Eav/AttributeMetadataBuilderTest.php | 6 +- .../Api/Code/Generator/DataBuilderTest.php | 113 ++- .../Api/Data/FakeAddressInterface.php | 16 + .../Wonderland/Model/Data/FakeAddress.php | 222 +++++ .../Wonderland/Model/Data/FakeRegion.php} | 47 +- .../Magento/Wonderland/Model/FakeAddress.php | 24 +- .../Template/Tokenizer/ParameterTest.php | 114 +++ .../Magento/Paypal/_files/quote_payment.php | 5 +- .../Paypal/_files/quote_payment_payflow.php | 2 +- .../Paypal/_files/quote_payment_standard.php | 2 +- .../Sales/Model/AdminOrder/CreateTest.php | 2 +- .../Magento/Sales/Model/Service/QuoteTest.php | 2 +- .../Model/Resource/Report/CollectionTest.php | 22 +- .../V1/Data/QuoteDetails/ItemBuilderTest.php | 6 +- .../V1/Data/QuoteDetailsBuilderTest.php | 6 +- .../Data/TaxDetails/AppliedTaxBuilderTest.php | 6 +- .../Service/V1/Data/TaxRateBuilderTest.php | 6 +- .../Data/TaxRateSearchResultsBuilderTest.php | 4 +- .../Service/V1/Data/TaxRuleBuilderTest.php | 6 +- .../Data/TaxRuleSearchResultsBuilderTest.php | 6 +- .../Test/Integrity/Di/CompilerTest.php | 4 +- .../Integrity/_files/blacklist/namespace.txt | 2 + .../Integrity/_files/blacklist/reference.txt | 3 + .../_files/dependency_test/tables_ce.php | 58 +- .../Test/Legacy/_files/obsolete_classes.php | 2 + .../Test/Legacy/_files/obsolete_methods.php | 15 + .../Legacy/_files/obsolete_properties.php | 1 + .../TestFramework/Helper/ObjectManager.php | 4 +- .../Magento/Catalog/Block/Widget/LinkTest.php | 29 + .../Product/Action/Attribute/SaveTest.php | 5 +- .../Category/Flat/Plugin/StoreGroupTest.php | 15 +- .../Category/Flat/Plugin/StoreViewTest.php | 13 +- .../Model/Indexer/Category/Flat/StateTest.php | 16 +- .../Category/Flat/System/Config/ModeTest.php | 42 +- .../Model/Indexer/Category/FlatTest.php | 47 +- .../Product/Plugin/StoreGroupTest.php | 14 +- .../Category/Product/Plugin/StoreViewTest.php | 15 +- .../Model/Indexer/Category/ProductTest.php | 37 +- .../Model/Indexer/Product/CategoryTest.php | 37 +- .../Indexer/Product/Flat/ProcessorTest.php | 30 +- .../Product/Price/Plugin/CatalogRuleTest.php | 128 --- .../Price/Plugin/CustomerGroupTest.php | 13 +- .../Price/System/Config/PriceScopeTest.php | 22 +- .../Catalog/Model/Product/ActionTest.php | 37 +- .../Attribute/Backend/CategoryTest.php | 3 +- .../Backend/Groupprice/AbstractTest.php | 2 - .../Magento/Catalog/Model/ProductTest.php | 18 +- .../Plugin/Model/Resource/ConfigTest.php | 199 ++++ .../Service/V1/Data/ProductBuilderTest.php | 4 +- .../Product/Price/Plugin/ImportTest.php | 13 +- .../Service/V1/StockItemServiceTest.php | 19 +- .../Magento/CatalogRule/Model/CronTest.php | 57 ++ .../Model/Indexer/AbstractIndexerTest.php | 97 ++ .../Product/ProductRuleIndexerTest.php | 88 ++ .../Indexer/Rule/RuleProductIndexerTest.php | 66 ++ .../Model/Rule/Condition/ProductTest.php | 3 +- .../CatalogRule/Model/Rule/JobTest.php | 44 +- .../Plugin/Indexer/CategoryTest.php | 81 ++ .../Plugin/Indexer/CustomerGroupTest.php | 62 ++ .../Plugin/Indexer/ImportExportTest.php | 64 ++ .../Indexer/Product/PriceIndexerTest.php | 90 ++ .../Plugin/Indexer/WebsiteTest.php | 62 ++ .../Indexer/Fulltext/Plugin/AttributeTest.php | 23 +- .../Fulltext/Plugin/Product/ActionTest.php | 24 +- .../Indexer/Fulltext/Plugin/ProductTest.php | 25 +- .../Fulltext/Plugin/Store/GroupTest.php | 23 +- .../Fulltext/Plugin/Store/ViewTest.php | 23 +- .../Model/Indexer/FulltextTest.php | 22 +- .../Checkout/Model/Type/OnepageTest.php | 1 + .../Cms/Block/Adminhtml/Block/EditTest.php | 115 +++ .../Adminhtml/Block/Widget/ChooserTest.php | 265 ++++++ .../testsuite/Magento/Cms/Helper/PageTest.php | 550 +++++++++++ .../Cms/Model/Config/Source/PageTest.php | 98 ++ .../Magento/Cms/Model/ObserverTest.php | 207 ++++ .../testsuite/Magento/Cms/Model/PageTest.php | 135 +++ .../Magento/Cms/Model/Wysiwyg/ConfigTest.php | 251 +++++ .../Magento/Contact/Helper/DataTest.php | 2 +- .../Magento/Customer/Model/ConverterTest.php | 2 +- .../Attribute/Backend/PasswordTest.php | 4 +- .../Customer/Attribute/Backend/StoreTest.php | 4 +- .../Attribute/Backend/WebsiteTest.php | 4 +- .../Model/Layout/DepersonalizePluginTest.php | 5 +- .../Service/V1/CustomerAccountServiceTest.php | 2 +- .../Service/V1/CustomerAddressServiceTest.php | 2 +- .../Service/V1/Data/AddressConverterTest.php | 7 +- .../Customer/Service/V1/Data/AddressTest.php | 12 +- .../Service/V1/Data/CustomerBuilderTest.php | 22 +- .../Customer/Service/V1/Data/CustomerTest.php | 2 +- .../Downloadable/Model/ObserverTest.php | 288 ++++++ .../Magento/Eav/Model/Entity/AbstractTest.php | 8 +- .../Model/Resource/Entity/AttributeTest.php | 129 +++ .../Api/Code/Generator/BuilderTest.php | 156 --- .../Api/Code/Generator/DataBuilderTest.php | 5 +- .../Code/Generator/GenerateBuilderTest.php | 84 -- .../GenerateSearchResultsBuilderTest.php | 3 +- .../_files/ExtensibleSampleDataBuilder.txt | 21 +- .../_files/SampleSearchResultsBuilder.txt | 2 +- .../Framework/Api/Data/AttributeValueTest.php | 8 +- .../App/View/Deployment/VersionTest.php | 14 +- .../Template/Tokenizer/ParameterTest.php | 5 +- .../Model/AbstractExtensibleModelTest.php | 8 +- .../Indexer/Model/IndexerRegistryTest.php | 45 + .../Magento/Payment/Model/InfoTest.php | 8 + .../Rule/Model/Condition/CombineTest.php | 125 ++- .../Rule/Model/ConditionFactoryTest.php | 28 +- .../Sales/Model/AdminOrder/CreateTest.php | 2 +- .../Quote/Address/CollectTotalsTest.php | 32 +- .../Magento/Sales/Model/QuoteTest.php | 105 ++ .../Resource/Order/Creditmemo/GridTest.php | 8 +- .../Sales/Model/Resource/Order/GridTest.php | 8 +- .../Model/Resource/Order/Invoice/GridTest.php | 8 +- .../Resource/Order/Shipment/GridTest.php | 8 +- .../Model/Quote/Nominal/DiscountTest.php | 103 +- .../Tax/Service/V1/TaxClassServiceTest.php | 7 +- .../UrlRewrite/Controller/RouterTest.php | 125 ++- .../Service/Entity/WebapiBuilderFactory.php | 2 +- dev/tools/Magento/Tools/Di/compiler.php | 3 +- .../Magento/Tools/Di/entity_generator.php | 4 +- .../factory_table_names/blacklist_ce.php | 2 +- .../factory_table_names/replace_ce.php | 54 +- dev/tools/Magento/Tools/View/Deployer.php | 14 +- dev/tools/performance-toolkit/benchmark.jmx | 673 +++++++------ .../fixtures/eav_variations.php | 6 + .../performance-toolkit/fixtures/stores.php | 17 +- .../Magento/ToolkitFramework/Application.php | 3 +- .../performance-toolkit/framework/labels.xml | 2 +- .../Api/AbstractExtensibleObject.php | 12 +- .../Api/AbstractSearchResultsBuilder.php | 15 +- .../Framework/Api/AbstractSimpleObject.php | 4 +- .../Api/AbstractSimpleObjectBuilder.php | 73 +- .../Framework/Api/AttributeDataBuilder.php | 26 +- .../Magento/Framework/Api/AttributeValue.php | 13 +- ...{ExtensibleDataBuilder.php => Builder.php} | 235 ++++- ...lderInterface.php => BuilderInterface.php} | 39 +- .../Framework/Api/Code/Generator/Builder.php | 158 --- .../Api/Code/Generator/DataBuilder.php | 138 +-- .../Code/Generator/SearchResultsBuilder.php | 2 +- .../Api/CompositeExtensibleDataBuilder.php | 168 ---- .../Framework/Api/ExtensibleDataInterface.php | 5 + .../Framework/Api/ExtensibleObjectBuilder.php | 83 +- lib/internal/Magento/Framework/Api/Filter.php | 2 +- .../Magento/Framework/Api/FilterBuilder.php | 2 +- .../Api/Search/FilterGroupBuilder.php | 38 +- .../Framework/Api/SearchCriteriaBuilder.php | 37 +- .../SimpleBuilderInterface.php} | 20 +- .../Framework/App/View/Deployment/Version.php | 18 +- .../Magento/Framework/AppInterface.php | 2 +- .../Filter/Template/Tokenizer/Parameter.php | 3 + .../Model/AbstractExtensibleModel.php | 28 +- .../Magento/Framework/Model/AbstractModel.php | 2 +- .../ObjectManager/DefinitionFactory.php | 4 +- .../Framework/ObjectManager/Profiler/Log.php | 15 +- .../Reflection/DataObjectProcessor.php | 4 +- .../Serialization/DataBuilderFactory.php | 2 +- lib/internal/Magento/Framework/composer.json | 2 +- .../mage/adminhtml/wysiwyg/tiny_mce/setup.js | 1 + 575 files changed, 10761 insertions(+), 6193 deletions(-) create mode 100644 app/code/Magento/Catalog/Plugin/Model/Resource/Config.php rename app/code/Magento/{SalesRule/sql/salesrule_setup/upgrade-1.6.0.0-1.6.0.1.php => CatalogRule/CatalogRuleException.php} (75%) create mode 100644 app/code/Magento/CatalogRule/Model/Cron.php create mode 100644 app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php create mode 100644 app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php rename lib/internal/Magento/Framework/App/View/Deployment/Version/Generator/Timestamp.php => app/code/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexer.php (70%) rename app/code/Magento/{Sales/sql/sales_setup/upgrade-1.6.0.2-1.6.0.3.php => CatalogRule/Model/Indexer/Product/ProductRuleProcessor.php} (74%) rename lib/internal/Magento/Framework/Api/AttributeValueBuilder.php => app/code/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexer.php (65%) rename app/code/Magento/{Paypal/sql/paypal_setup/upgrade-1.6.0.1-1.6.0.2.php => CatalogRule/Model/Indexer/Rule/RuleProductProcessor.php} (73%) create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/Category.php create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/CustomerGroup.php create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/ImportExport.php create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/Product/Attribute.php rename app/code/Magento/{Catalog/Model/Indexer/Product/Price/Plugin/CatalogRule.php => CatalogRule/Plugin/Indexer/Product/PriceIndexer.php} (50%) create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRules.php create mode 100644 app/code/Magento/CatalogRule/Plugin/Indexer/Website.php create mode 100644 app/code/Magento/CatalogRule/etc/indexer.xml create mode 100644 app/code/Magento/CatalogRule/etc/mview.xml create mode 100644 app/code/Magento/CatalogRule/sql/catalogrule_setup/upgrade-1.6.0.3-1.6.0.4.php rename app/code/Magento/Dhl/data/dhl_setup/{data-install-2.0.0.0.php => data-install-2.0.0.php} (100%) create mode 100644 app/code/Magento/Eav/Plugin/Model/Resource/Entity/Attribute.php rename app/code/Magento/Fedex/data/fedex_setup/{data-install-2.0.0.0.php => data-install-2.0.0.php} (100%) create mode 100644 app/code/Magento/Indexer/Model/IndexerRegistry.php rename app/code/Magento/OfflineShipping/sql/offlineshipping_setup/{install-2.0.0.0.php => install-2.0.0.php} (95%) rename app/code/Magento/Ogone/data/ogone_setup/{data-install-1.6.0.0.php => data-install-2.0.0.php} (100%) rename app/code/Magento/Paypal/data/paypal_setup/{data-install-1.6.0.0.php => data-install-2.0.0.php} (91%) delete mode 100644 app/code/Magento/Paypal/data/paypal_setup/data-upgrade-1.6.0.2-1.6.0.3.php rename app/code/Magento/Paypal/sql/paypal_setup/{install-1.6.0.0.php => install-2.0.0.php} (88%) delete mode 100644 app/code/Magento/Paypal/sql/paypal_setup/upgrade-1.6.0.0-1.6.0.1.php rename app/code/Magento/RecurringPayment/data/recurringpayment_setup/{data-install-1.0.0.0.php => data-install-2.0.0.php} (100%) create mode 100644 app/code/Magento/RecurringPayment/etc/frontend/di.xml rename app/code/Magento/RecurringPayment/sql/recurringpayment_setup/{install-1.0.0.0.php => install-2.0.0.php} (99%) rename app/code/Magento/Sales/data/sales_setup/{data-install-1.6.0.0.php => data-install-2.0.0.php} (71%) delete mode 100644 app/code/Magento/Sales/data/sales_setup/data-upgrade-1.6.0.4-1.6.0.5.php delete mode 100644 app/code/Magento/Sales/data/sales_setup/data-upgrade-1.6.0.5-1.6.0.6.php rename app/code/Magento/Sales/sql/sales_setup/{install-1.6.0.0.php => install-2.0.0.php} (85%) delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.0-1.6.0.1.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.1-1.6.0.2.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.11-1.6.0.12.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.3-1.6.0.4.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.4-1.6.0.5.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.6-1.6.0.7.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.7-1.6.0.8.php delete mode 100644 app/code/Magento/Sales/sql/sales_setup/upgrade-1.6.0.8-1.6.0.9.php rename app/code/Magento/SalesRule/data/salesrule_setup/{data-upgrade-1.6.0.3-1.6.0.4.php => data-install-2.0.0.php} (100%) rename app/code/Magento/SalesRule/sql/salesrule_setup/{install-1.6.0.0.php => install-2.0.0.php} (66%) delete mode 100644 app/code/Magento/SalesRule/sql/salesrule_setup/upgrade-1.6.0.1-1.6.0.2.php delete mode 100644 app/code/Magento/SalesRule/sql/salesrule_setup/upgrade-1.6.0.2-1.6.0.3.php create mode 100644 app/code/Magento/Tax/etc/frontend/di.xml rename app/code/Magento/Usps/data/usps_setup/{data-install-2.0.0.0.php => data-install-2.0.0.php} (100%) rename dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/AdvancedSearchEntityTest/{testSearch.csv => test.csv} (77%) create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_attribute_with_invalid_apply_to.php create mode 100644 dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/IndexerBuilderTest.php create mode 100644 dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/ProductRuleTest.php create mode 100644 dev/tests/integration/testsuite/Magento/CatalogRule/Model/Indexer/RuleProductTest.php create mode 100644 dev/tests/integration/testsuite/Magento/CatalogRule/_files/attribute.php rename app/code/Magento/Paypal/sql/paypal_setup/upgrade-1.6.0.3-1.6.0.4.php => dev/tests/integration/testsuite/Magento/CatalogRule/_files/rule_by_attribute.php (50%) rename app/code/Magento/Sales/data/sales_setup/data-upgrade-1.6.0.11-1.6.0.12.php => dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/IndexTest.php (64%) create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeAddress.php rename dev/tests/{unit/testsuite/Magento/Framework/App/View/Deployment/Version/Generator/TimestampTest.php => integration/testsuite/Magento/Framework/Api/_files/Magento/Wonderland/Model/Data/FakeRegion.php} (56%) create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Filter/Template/Tokenizer/ParameterTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CatalogRuleTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Plugin/Model/Resource/ConfigTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/CronTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/Indexer/AbstractIndexerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/Indexer/Product/ProductRuleIndexerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Model/Indexer/Rule/RuleProductIndexerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CategoryTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/CustomerGroupTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/ImportExportTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/Product/PriceIndexerTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogRule/Plugin/Indexer/WebsiteTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/Widget/ChooserTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Model/Config/Source/PageTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Model/ObserverTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Model/PageTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Eav/Plugin/Model/Resource/Entity/AttributeTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/BuilderTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Framework/Api/Code/Generator/GenerateBuilderTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Indexer/Model/IndexerRegistryTest.php rename lib/internal/Magento/Framework/Api/{ExtensibleDataBuilder.php => Builder.php} (50%) rename lib/internal/Magento/Framework/Api/{ExtensibleDataBuilderInterface.php => BuilderInterface.php} (60%) delete mode 100644 lib/internal/Magento/Framework/Api/Code/Generator/Builder.php delete mode 100644 lib/internal/Magento/Framework/Api/CompositeExtensibleDataBuilder.php rename lib/internal/Magento/Framework/{App/View/Deployment/Version/GeneratorInterface.php => Api/SimpleBuilderInterface.php} (74%) diff --git a/.gitignore b/.gitignore index 90b240f3af0e9..99db0d9803846 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ atlassian* /pub/media/*.* !/pub/media/.htaccess +/pub/media/catalog/* +!/pub/media/catalog/.htaccess /pub/media/customer/* !/pub/media/customer/.htaccess /pub/media/downloadable/* @@ -29,6 +31,8 @@ atlassian* /pub/media/theme/* /pub/media/theme_customization/* !/pub/media/theme_customization/.htaccess +/pub/media/tmp/* +!/pub/media/tmp/.htaccess /pub/static/* !/pub/static/.htaccess diff --git a/CHANGELOG.md b/CHANGELOG.md index 868b7a35b2886..4e779e9213961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,44 @@ +0.1.0-alpha104 +============= +* Various improvements: + * Merge SQL and Data Upgrades for the Sales and SalesRule modules + * Add getDefaultBilling and getDefaultShipping to Customer Interface + * Stabilized the Bundle module + * Stabilized the CatalogSearch module + * Stabilized the Cms module + * Stabilized the SalesRule module +* Performance improvements: + * Introduced CatalogRule indexers based on Mview + * Significantly decreased the amount of unused objects, mostly in category and product view scenarios: + * Got rid of non-shared indexer instances all over the code introducing Magento\Indexer\Model\IndexerRegistry + * Magento\Catalog\Pricing\Price\BasePrice being created on demand only, instead of unconditioned creation in constructor + * Created proxies for unused objects with big amount of dependencies + * Fixed \Magento\Review\Block\Product\Review block which injected backend block context by mistake + * A customer model in \Magento\Customer\Model\Layout\DepersonalizePlugin being created on demand only, instead of constructor + * Introduced caching for product attribute metadata loading procedure + * Improved SavePayment Checkout step to save only payment related data + * Speed up all Checkout steps of the One Page Checkout + * Updated the benchmark.jmx jmeter script in the performance toolkit +* Fixed bugs: + * Fixed an issue where performance toolkit generator created Products/Categories without URL rewrites due to install area elimination + * Fixed an issue where the Custom Options fieldset on Product Information page was collapsible + * Fixed an issue where the Base URL was added to target path for Custom UrlRewrite + * Fixed an issue where an invalid Cross-sells amount was displayed in the Shopping Cart + * Fixed an issue where the Mage_Catalog_Model_Product_Type_AbstractTest::testBeforeSave integration test failed when Mage_Downloadable module was not available + * Fixed an issue where the custom URL rewrite redirected to sub-folder when Request Path contained slash + * Fixed an issue where it was impossible to place an order if registering during checkout + * Fixed an issue where there was no possibility to save default billing and shipping addresses for customer on the store front + * Fixed an issue where a widget of Catalog Category Link type was not displayed on the store front + * Fixed an issue where the Versions tab was absent on the CMS page with version control + * Fixed an issue where it was impossible to insert Widgets and Images to a CMS page +* Added the following functional tests: + * Create widget + * Print order from guest on frontend +* Framework Improvements: + * Removed duplicated logic from API Builders and Builder generators. Added support for populating builders from the objects, implementing data interface +* Processed GitHub requests: + * [#674](https://github.com/magento/magento2/issues/674) -- Widgets in content pages + 0.1.0-alpha103 ============= * Fixed bugs: diff --git a/README.md b/README.md index 509292e891431..5a4d56047c98b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Before you install Magento 2, make sure your system meets or exceeds the followi * Composer (latest stable version) * Apache 2.2 or later -* PHP 5.4.11 or 5.5.x (installation instructions, upgrade instructions) +* PHP 5.4.11 or 5.5.x * Required PHP extensions: * PDO/MySQL @@ -37,15 +37,13 @@ Before you install Magento 2, make sure your system meets or exceeds the followi * gd2, ImageMagick 6.3.7 (or later) or both * soap -* MySQL 5.5 or later +* MySQL 5.6.x * Mail Transfer Agent (MTA) or an SMTP server * Optional but recommended: * php_xdebug2.2.0 or later (development environments only; can have an adverse effect on performance) - * PHPUnit (as a command-line tool) 3.7 or later + * PHPUnit (as a command-line tool) 4.1 or later - -

Composer and Magento

We now use Composer to install the Magento 2 software. Composer enables us to manage Magento 2, extensions, and their dependencies. @@ -87,7 +85,7 @@ Use the following table to verify you have the correct prerequisites to install php -v PHP - MySQL 5.5 or later + MySQL 5.6.x mysql -u [root user name] -p MySQL @@ -142,7 +140,7 @@ Before you install Magento, you must do all of the following:
  • Specify the type of directives that can be used in .htaccess. Magento uses .htaccess for redirects. For guidelines, see: