From 8611ea725e25c67683f3f7e533406291ae8a723b Mon Sep 17 00:00:00 2001 From: mage2-team Date: Fri, 11 Apr 2014 13:28:40 -0700 Subject: [PATCH] 2.0.0.0-dev73 * Framework Improvements: * Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead. * Fixed performance degradation caused by DI argument processors * Covered Magento library components with unit tests: * Magento/App/Request * Magento/App/Resource directory and Magento/App/Resource.php * Magento/App/Response * Magento/App/Route * Magento/App/Router * Magento/App/Http.php * Magento/Translate.php * Improved the Web API framework based on Customer Service * Updated the API Service Exception Handling * Changed the conventional notation of Vendor name in theme path: from `app/design//_` to `app/design///` * Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library * Themes update: * Updated the look&feel of the Admin theme * Modularity improvements: * Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store * Moved the library part of the Config component from the Magento_Core module to the library * Moved the Session related logic from the Magento_Core module to the library * Moved the abstract logic related to Magento "Module" from Magento_Core to the library * Moved the form key related functionality to the library * Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module * Moved the resource model to Magento_Install module * Eliminated the Core\Helper\Js class * Moved the Email related logic from Magento_Core module to Magento_Email module * Moved the Cache related logic from the Magento_Core module to the library * Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled * Eliminated Magento_Catalog dependency on Magento_Rating * Removed the Magento_Rating module, its logic moved to Magento_Review * Moved the View related components from Magento_Core to the Magento/View library * Refactored the following modules to use Customer Service * Magento_Multishipping * Magento_Paypal * Magento_Log * Magento_RSS * Magento_Review * Magento_Wishlist * Magento_Weee * Magento_CatalogInventory * Magento_CatalogRule * Magento_SalesRule * GitHub requests: * [#520] (https://github.com/magento/magento2/issues/520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod * [#481] (https://github.com/magento/magento2/issues/481) -- GD2 Adapter PHP memory_limit * [#516] (https://github.com/magento/magento2/issues/516) -- Make Sure That save_before Event Is Dispatched * [#465] (https://github.com/magento/magento2/issues/465) -- Absolute path is assembled incorrectly when merging js/css files * [#504] (https://github.com/magento/magento2/issues/504) -- Renamed "contacts" module to "contact" * [#529] (https://github.com/magento/magento2/issues/529) -- Fixed exception at admin dashboard * [#535] (https://github.com/magento/magento2/issues/535) -- Fixed an issue during creating or editing product template * [#535] (https://github.com/magento/magento2/issues/535) -- Fixed Typo in the module name * [#538] (https://github.com/magento/magento2/issues/538) -- Fixed missing tax amount in the invoice * [#518] (https://github.com/magento/magento2/issues/518) -- Change to Magento\Customer\Block\Widget\Dob new version * Fixed bugs: * Fixed implementation issues with Cron task group threading * Fixed inability to place order during customer registration flow * Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS * Fixed an issue where it was impossible for users with restricted permission to export certain entities * Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses * Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout * Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order) * Fixed an issue where the special price for a bundle product was calculated wrongly * Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module * Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing * Fixed an issue where the active tab changed after changing the attribute set * Fixed an issue with incorrect order of product types in the Add Product menu in the backend * Fixed an issue with saving the tier price attribute * JavaScript improvements: * Upgraded the frontend jQuery library to version 1.11 * Upgraded the frontend jQuery UI library to version 1.10.4 * Modified the loader widget to render content using handlebars * Added the 'use strict' mode to the accordion widget * Added the 'use strict' mode to the tab widget --- CHANGELOG.md | 81 +- .../Magento/AdminNotification/Block/Inbox.php | 9 - .../Magento/AdminNotification/Helper/Data.php | 10 +- .../Model/System/Message/Baseurl.php | 28 +- .../Model/System/Message/Security.php | 8 +- .../AdminNotification/etc/adminhtml/di.xml | 7 + .../Magento/AdminNotification/etc/module.xml | 2 + .../install-1.6.0.0.php | 2 +- .../upgrade-1.6.0.0-2.0.0.0.php | 2 +- .../view/adminhtml/layout/default.xml | 6 +- .../view/adminhtml/toolbar_entry.js | 36 +- .../view/adminhtml/toolbar_entry.phtml | 37 +- .../Magento/Authorizenet/Helper/Backend.php | 4 +- app/code/Magento/Authorizenet/Helper/Data.php | 6 +- .../Authorizenet/Model/Authorizenet.php | 6 +- .../Magento/Authorizenet/Model/Directpost.php | 12 +- .../Model/Directpost/Observer.php | 6 +- .../Authorizenet/Model/Directpost/Session.php | 4 +- app/code/Magento/Authorizenet/etc/module.xml | 1 + .../Magento/Authz/Service/AuthorizationV1.php | 6 +- .../Service/AuthorizationV1Interface.php | 2 +- app/code/Magento/Authz/etc/module.xml | 2 +- app/code/Magento/Backend/App/Config.php | 16 +- .../Magento/Backend/App/ConfigInterface.php | 7 - .../Backend/App/Request/PathInfoProcessor.php | 6 +- .../Backend/App/Router/DefaultRouter.php | 16 +- app/code/Magento/Backend/Block/Cache.php | 4 +- app/code/Magento/Backend/Block/Context.php | 6 +- app/code/Magento/Backend/Block/Dashboard.php | 2 +- .../Magento/Backend/Block/Dashboard/Bar.php | 2 +- .../Magento/Backend/Block/Dashboard/Graph.php | 43 +- .../Backend/Block/Dashboard/Totals.php | 26 +- .../Magento/Backend/Block/Page/Header.php | 2 +- .../Magento/Backend/Block/Page/Locale.php | 110 + .../Magento/Backend/Block/Page/Notices.php | 4 +- .../Block/Page/System/Config/Robots/Reset.php | 14 +- .../Magento/Backend/Block/Store/Switcher.php | 319 +- .../Backend/Block/System/Config/Dwstree.php | 4 +- .../Backend/Block/System/Config/Edit.php | 2 +- .../Backend/Block/System/Config/Form.php | 12 +- .../Backend/Block/System/Config/Switcher.php | 19 +- .../Magento/Backend/Block/System/Design.php | 4 +- .../Backend/Block/System/Design/Edit.php | 29 +- .../Block/System/Design/Edit/Tab/General.php | 6 +- .../Block/System/Store/Edit/Form/Group.php | 12 +- .../Block/System/Store/Edit/Form/Store.php | 12 +- .../Block/System/Store/Edit/Form/Website.php | 6 +- .../Backend/Block/System/Store/Store.php | 7 +- .../Backend/Block/System/Variable/Edit.php | 3 +- app/code/Magento/Backend/Block/Template.php | 16 +- .../Backend/Block/Template/Context.php | 16 +- .../Block/Urlrewrite/Catalog/Edit/Form.php | 10 +- .../Block/Urlrewrite/Cms/Page/Edit/Form.php | 8 +- .../Magento/Backend/Block/Urlrewrite/Edit.php | 2 +- .../Backend/Block/Urlrewrite/Edit/Form.php | 6 +- .../Backend/Block/Widget/Container.php | 58 +- .../Backend/Block/Widget/Form/Container.php | 2 +- .../Block/Widget/Grid/Column/Filter/Date.php | 7 +- .../Widget/Grid/Column/Filter/Datetime.php | 80 +- .../Block/Widget/Grid/Column/Filter/Store.php | 7 +- .../Widget/Grid/Column/Renderer/Currency.php | 13 +- .../Widget/Grid/Column/Renderer/Store.php | 8 +- .../Backend/Block/Widget/Grid/Container.php | 2 +- .../Backend/Controller/Adminhtml/Index.php | 10 + .../Controller/Adminhtml/System/Config.php | 6 +- .../Controller/Adminhtml/System/Store.php | 30 +- .../Magento/Backend/Helper/Dashboard/Data.php | 10 +- .../Backend/Helper/Dashboard/Order.php | 12 +- app/code/Magento/Backend/Model/Auth.php | 6 +- .../Magento/Backend/Model/Auth/Session.php | 5 +- app/code/Magento/Backend/Model/Config.php | 48 +- .../Model/Config/Backend/Admin/Custom.php | 10 +- .../Model/Config/Backend/Admin/Custompath.php | 2 +- .../Model/Config/Backend/Admin/Observer.php | 10 +- .../Admin/Password/Link/Expirationperiod.php | 2 +- .../Model/Config/Backend/Admin/Robots.php | 10 +- .../Model/Config/Backend/Admin/Usecustom.php | 10 +- .../Config/Backend/Admin/Usesecretkey.php | 10 +- .../Backend/Model/Config/Backend/Baseurl.php | 46 +- .../Backend/Model/Config/Backend/Cache.php | 2 +- .../Backend/Model/Config/Backend/Cookie.php | 2 +- .../Backend/Currency/AbstractCurrency.php | 28 +- .../Model/Config/Backend/Currency/Allow.php | 21 +- .../Model/Config/Backend/Currency/Cron.php | 16 +- .../Model/Config/Backend/Datashare.php | 2 +- .../Model/Config/Backend/Email/Address.php | 2 +- .../Model/Config/Backend/Email/Sender.php | 2 +- .../Model/Config/Backend/Encrypted.php | 10 +- .../Backend/Model/Config/Backend/File.php | 14 +- .../Backend/Model/Config/Backend/Filename.php | 2 +- .../Model/Config/Backend/Image/Adapter.php | 10 +- .../Backend/Model/Config/Backend/Locale.php | 32 +- .../Model/Config/Backend/Locale/Timezone.php | 2 +- .../Backend/Model/Config/Backend/Log/Cron.php | 16 +- .../Backend/Model/Config/Backend/Secure.php | 10 +- .../Model/Config/Backend/Serialized.php | 2 +- .../Config/Backend/Storage/Media/Database.php | 10 +- .../Backend/Model/Config/Backend/Store.php | 36 +- .../Model/Config/Backend/Translate.php | 27 +- .../Magento/Backend/Model/Config/Loader.php | 6 +- .../Backend/Model/Config/ScopeDefiner.php | 10 +- .../Backend/Model/Config/Source/Store.php | 8 +- .../Backend/Model/Config/Source/Website.php | 6 +- .../Config/Source/Website/AdminOptionHash.php | 2 +- .../Config/Source/Website/OptionHash.php | 2 +- .../Config/Structure/AbstractElement.php | 8 +- .../Structure/Element/AbstractComposite.php | 4 +- .../Structure/Element/Dependency/Mapper.php | 20 +- .../Model/Config/Structure/Element/Field.php | 4 +- .../Model/Config/Structure/Element/Group.php | 4 +- .../Config/Structure/Element/Section.php | 4 +- .../Magento/Backend/Model/Locale/Resolver.php | 10 +- .../Magento/Backend/Model/Menu/Config.php | 12 +- app/code/Magento/Backend/Model/Menu/Item.php | 14 +- app/code/Magento/Backend/Model/Observer.php | 4 +- .../Model/Resource/Translate.php} | 17 +- .../Model/Resource/Translate/String.php} | 19 +- app/code/Magento/Backend/Model/Session.php | 5 +- .../Magento/Backend/Model/Session/Quote.php | 29 +- app/code/Magento/Backend/Model/Url.php | 54 +- app/code/Magento/Backend/etc/adminhtml/di.xml | 8 +- app/code/Magento/Backend/etc/di.xml | 3 +- app/code/Magento/Backend/etc/module.xml | 1 + .../Backend/view/adminhtml/admin/login.phtml | 5 +- .../Backend/view/adminhtml/admin/page.phtml | 15 +- .../view/adminhtml/dashboard/graph.phtml | 28 +- .../view/adminhtml/dashboard/grid.phtml | 66 +- .../view/adminhtml/dashboard/index.phtml | 46 +- .../view/adminhtml/dashboard/salebar.phtml | 19 +- .../view/adminhtml/dashboard/totalbar.phtml | 25 +- .../layout/adminhtml_dashboard_index.xml | 19 +- .../layout/adminhtml_system_config_edit.xml | 14 +- .../adminhtml_system_store_grid_block.xml | 2 +- .../adminhtml_system_variable_edit.xml} | 26 +- .../Backend/view/adminhtml/layout/default.xml | 43 +- .../view/adminhtml/page/copyright.phtml | 4 +- .../Backend/view/adminhtml/page/footer.phtml | 7 +- .../Backend/view/adminhtml/page/header.phtml | 50 +- .../view/adminhtml/page/js/components.phtml | 4 +- .../Backend/view/adminhtml/page/locale.phtml | 40 + .../view/adminhtml/pageactions.phtml} | 9 +- .../view/adminhtml/store/switcher.phtml | 128 +- .../adminhtml/store/switcher/enhanced.phtml | 55 +- .../view/adminhtml/system/config/edit.phtml | 1 - .../adminhtml/system/config/switcher.phtml | 4 +- .../view/adminhtml/system/design/edit.phtml | 7 - .../view/adminhtml/system/design/index.phtml | 1 - .../view/adminhtml/system/search.phtml | 58 +- .../view/adminhtml/urlrewrite/edit.phtml | 1 - .../adminhtml/widget/form/container.phtml | 4 +- .../Magento/Backup/Block/Adminhtml/Backup.php | 55 +- .../Backup/Model/Config/Backend/Cron.php | 16 +- app/code/Magento/Backup/Model/Observer.php | 18 +- app/code/Magento/Backup/etc/module.xml | 2 + .../Backup/view/adminhtml/backup/list.phtml | 5 - .../Edit/Tab/Bundle/Option/Search/Grid.php | 10 +- .../Bundle/Block/Catalog/Product/Price.php | 4 +- app/code/Magento/Bundle/Model/Price/Index.php | 6 +- .../Bundle/Model/Product/CatalogPrice.php | 12 +- .../Magento/Bundle/Model/Product/Price.php | 31 +- .../Magento/Bundle/Model/Product/Type.php | 8 +- .../Bundle/Model/Resource/Indexer/Price.php | 4 +- .../Bundle/Model/Resource/Price/Index.php | 8 +- app/code/Magento/Bundle/etc/module.xml | 1 + app/code/Magento/Bundle/etc/product_types.xml | 2 +- .../sql/bundle_setup/install-1.6.0.0.php | 8 +- .../Magento/Captcha/Helper/Adminhtml/Data.php | 12 +- app/code/Magento/Captcha/Helper/Data.php | 22 +- .../Model/Config/Form/AbstractForm.php | 2 +- app/code/Magento/Captcha/Model/Cron.php | 14 +- app/code/Magento/Captcha/Model/Observer.php | 2 +- .../Magento/Captcha/etc/frontend/events.xml | 2 +- app/code/Magento/Captcha/etc/module.xml | 1 + .../sql/captcha_setup/install-1.7.0.0.0.php | 2 +- .../Adminhtml/Category/AbstractCategory.php | 2 +- .../Catalog/Block/Adminhtml/Category/Edit.php | 3 + .../Block/Adminhtml/Category/Edit/Form.php | 5 +- .../Block/Adminhtml/Category/Helper/Image.php | 6 +- .../Block/Adminhtml/Category/Tab/Product.php | 6 +- .../Catalog/Block/Adminhtml/Category/Tree.php | 12 +- .../Form/Renderer/Fieldset/Element.php | 2 +- .../Catalog/Block/Adminhtml/Product.php | 21 +- .../Adminhtml/Product/Attribute/Edit.php | 11 + .../Adminhtml/Product/Attribute/Set/Main.php | 100 +- .../Product/Attribute/Set/Toolbar/Add.php | 56 +- .../Product/Attribute/Set/Toolbar/Main.php | 4 +- .../Catalog/Block/Adminhtml/Product/Edit.php | 32 +- .../Product/Edit/Action/Attribute.php | 3 +- .../Edit/Action/Attribute/Tab/Inventory.php | 2 +- .../Edit/Action/Attribute/Tab/Websites.php | 4 +- .../Block/Adminhtml/Product/Edit/Js.php | 2 +- .../Adminhtml/Product/Edit/Tab/Alerts.php | 8 +- .../Product/Edit/Tab/Alerts/Price.php | 5 +- .../Adminhtml/Product/Edit/Tab/Crosssell.php | 5 +- .../Adminhtml/Product/Edit/Tab/Inventory.php | 6 +- .../Product/Edit/Tab/Options/Option.php | 49 +- .../Edit/Tab/Price/Group/AbstractGroup.php | 4 +- .../Adminhtml/Product/Edit/Tab/Related.php | 5 +- .../Adminhtml/Product/Edit/Tab/Upsell.php | 5 +- .../Adminhtml/Product/Edit/Tab/Websites.php | 14 +- .../Catalog/Block/Adminhtml/Product/Grid.php | 8 +- .../Adminhtml/Product/Helper/Form/Gallery.php | 8 +- .../Adminhtml/Product/Helper/Form/Price.php | 4 +- .../Catalog/Block/Adminhtml/Product/Price.php | 4 +- .../Block/Adminhtml/Search/Edit/Form.php | 6 +- .../Magento/Catalog/Block/Breadcrumbs.php | 4 +- .../Magento/Catalog/Block/Category/View.php | 2 +- app/code/Magento/Catalog/Block/Navigation.php | 6 +- .../Magento/Catalog/Block/Product/Context.php | 10 +- .../Catalog/Block/Product/ListProduct.php | 2 +- .../Block/Product/ProductList/Toolbar.php | 31 +- .../ReviewRenderer/DefaultProvider.php | 2 +- .../Block/Product/ReviewRendererInterface.php | 7 +- .../Magento/Catalog/Block/Widget/Link.php | 2 +- .../Catalog/Controller/Adminhtml/Category.php | 12 +- .../Catalog/Controller/Adminhtml/Product.php | 6 +- .../Product/Initialization/Helper.php | 6 +- .../Initialization/StockDataFilter.php | 15 +- .../Magento/Catalog/Controller/Category.php | 6 +- .../Catalog/Controller/Product/Compare.php | 8 +- app/code/Magento/Catalog/Helper/Catalog.php | 14 +- app/code/Magento/Catalog/Helper/Category.php | 37 +- app/code/Magento/Catalog/Helper/Data.php | 71 +- app/code/Magento/Catalog/Helper/Image.php | 30 +- app/code/Magento/Catalog/Helper/Product.php | 49 +- .../Catalog/Helper/Product/Compare.php | 4 +- .../Catalog/Helper/Product/Composite.php | 4 +- .../Helper/Product/Edit/Action/Attribute.php | 2 +- .../Catalog/Helper/Product/Flat/Indexer.php | 6 +- .../Catalog/Helper/Product/ProductList.php | 37 +- .../Magento/Catalog/Model/AbstractModel.php | 8 +- app/code/Magento/Catalog/Model/Category.php | 10 +- .../Category/Attribute/Backend/Sortby.php | 15 +- app/code/Magento/Catalog/Model/Config.php | 18 +- .../Catalog/Model/Config/Backend/Category.php | 10 +- .../Model/Config/Backend/Seo/Product.php | 2 +- .../Model/Config/CatalogClone/Media/Image.php | 10 +- .../Catalog/Model/Entity/Attribute.php | 10 +- .../Model/Indexer/AbstractFlatState.php | 12 +- .../Indexer/Category/Flat/AbstractAction.php | 10 +- .../Indexer/Category/Flat/Action/Full.php | 12 +- .../Indexer/Category/Flat/Action/Rows.php | 16 +- .../Category/Flat/System/Config/Mode.php | 10 +- .../Category/Product/AbstractAction.php | 38 +- .../Indexer/Category/Product/Action/Rows.php | 8 +- .../Indexer/Product/Category/Action/Rows.php | 12 +- .../Indexer/Product/Flat/AbstractAction.php | 16 +- .../Indexer/Product/Flat/FlatTableBuilder.php | 12 +- .../Indexer/Product/Flat/Plugin/Store.php | 4 +- .../Product/Flat/Plugin/StoreGroup.php | 8 +- .../Model/Indexer/Product/Flat/State.php | 8 +- .../Product/Flat/System/Config/Mode.php | 10 +- .../Indexer/Product/Price/AbstractAction.php | 24 +- .../Model/Indexer/Product/Price/Observer.php | 6 +- .../Indexer/Product/Price/Plugin/Website.php | 8 +- .../Price/System/Config/PriceScope.php | 10 +- .../Magento/Catalog/Model/Indexer/Url.php | 53 +- app/code/Magento/Catalog/Model/Layer.php | 8 +- .../Magento/Catalog/Model/Layer/Category.php | 4 +- .../Category/FilterableAttributeList.php | 6 +- .../Catalog/Model/Layer/Category/StateKey.php | 6 +- .../Model/Layer/Filter/AbstractFilter.php | 6 +- .../Catalog/Model/Layer/Filter/Attribute.php | 4 +- .../Catalog/Model/Layer/Filter/Category.php | 4 +- .../Catalog/Model/Layer/Filter/Decimal.php | 4 +- .../Catalog/Model/Layer/Filter/Price.php | 52 +- .../Magento/Catalog/Model/Layer/Search.php | 4 +- .../Model/Layer/Search/CollectionFilter.php | 6 +- .../Layer/Search/FilterableAttributeList.php | 4 +- .../Catalog/Model/Layer/Search/StateKey.php | 4 +- app/code/Magento/Catalog/Model/Observer.php | 14 +- app/code/Magento/Catalog/Model/Product.php | 58 +- .../Product/Attribute/Backend/Groupprice.php | 8 +- .../Backend/Groupprice/AbstractGroupprice.php | 10 +- .../Model/Product/Attribute/Backend/Media.php | 2 +- .../Model/Product/Attribute/Backend/Price.php | 12 +- .../Product/Attribute/Backend/Tierprice.php | 18 +- .../Product/Attribute/Frontend/Image.php | 6 +- .../Attribute/Source/Countryofmanufacture.php | 6 +- .../Catalog/Model/Product/CatalogPrice.php | 2 +- .../Model/Product/CatalogPriceInterface.php | 2 +- .../Catalog/Model/Product/Compare/Item.php | 6 +- .../Magento/Catalog/Model/Product/Copier.php | 2 +- .../Magento/Catalog/Model/Product/Image.php | 23 +- .../Catalog/Model/Product/Media/Config.php | 6 +- .../Model/Product/Option/Type/Date.php | 6 +- .../Model/Product/Option/Type/DefaultType.php | 12 +- .../Model/Product/Option/Type/File.php | 6 +- .../Model/Product/Option/Type/Select.php | 6 +- .../Model/Product/Option/Type/Text.php | 6 +- .../Model/Product/ReservedAttributeList.php | 64 + .../Model/Product/Type/AbstractType.php | 4 +- .../Catalog/Model/Product/Type/Price.php | 8 +- .../Magento/Catalog/Model/Product/Url.php | 6 +- .../Model/ProductTypes/Config/Converter.php | 1 + .../Model/Resource/AbstractResource.php | 12 +- .../Catalog/Model/Resource/Attribute.php | 4 +- .../Catalog/Model/Resource/Category.php | 6 +- .../Category/Attribute/Frontend/Image.php | 6 +- .../Model/Resource/Category/Collection.php | 2 +- .../Catalog/Model/Resource/Category/Flat.php | 8 +- .../Resource/Category/Flat/Collection.php | 6 +- .../Catalog/Model/Resource/Category/Tree.php | 8 +- .../Collection/AbstractCollection.php | 14 +- .../Magento/Catalog/Model/Resource/Config.php | 6 +- .../Catalog/Model/Resource/Eav/Attribute.php | 10 +- .../Catalog/Model/Resource/Product.php | 4 +- .../Model/Resource/Product/Collection.php | 50 +- .../Product/Compare/Item/Collection.php | 10 +- .../Catalog/Model/Resource/Product/Flat.php | 8 +- .../Product/Indexer/AbstractIndexer.php | 6 +- .../Product/Indexer/Eav/AbstractEav.php | 2 +- .../Resource/Product/Indexer/Eav/Decimal.php | 6 +- .../Resource/Product/Indexer/Eav/Source.php | 8 +- .../Product/Indexer/Price/DefaultPrice.php | 18 +- .../Catalog/Model/Resource/Product/Option.php | 38 +- .../Resource/Product/Option/Collection.php | 10 +- .../Model/Resource/Product/Option/Value.php | 60 +- .../Product/Option/Value/Collection.php | 18 +- .../Model/Resource/Product/Website.php | 6 +- .../Magento/Catalog/Model/Resource/Setup.php | 13 +- .../Magento/Catalog/Model/Resource/Url.php | 16 +- .../Backend/Catalog/Url/Rewrite/Suffix.php | 10 +- .../Magento/Catalog/Model/Template/Filter.php | 6 +- app/code/Magento/Catalog/Model/Url.php | 2 +- .../catalog_setup/data-install-1.6.0.0.php | 8 +- .../data-upgrade-1.6.0.0.16-1.6.0.0.17.php | 16 +- app/code/Magento/Catalog/etc/di.xml | 19 +- app/code/Magento/Catalog/etc/module.xml | 1 + .../Magento/Catalog/etc/product_types.xml | 4 +- .../Magento/Catalog/etc/product_types.xsd | 1 + .../Catalog/etc/product_types_merged.xsd | 1 + .../sql/catalog_setup/install-1.6.0.0.0.php | 104 +- .../sql/catalog_setup/install-1.6.0.0.php | 3995 +++++ .../upgrade-1.6.0.0.25-1.6.0.0.26.php | 2 +- .../upgrade-1.6.0.0.9-1.6.0.0.10.php | 8 +- .../adminhtml/catalog/category/tree.phtml | 48 +- .../view/adminhtml/catalog/product.phtml | 4 - .../catalog/product/attribute/labels.phtml | 2 +- .../catalog/product/attribute/options.phtml | 2 +- .../catalog/product/attribute/set/main.phtml | 9 +- .../product/attribute/set/toolbar/add.phtml | 4 - .../product/attribute/set/toolbar/main.phtml | 1 - .../view/adminhtml/catalog/product/edit.phtml | 6 +- .../adminhtml/catalog/product/price.phtml | 4 +- .../layout/catalog_category_edit.xml | 11 + .../catalog_product_action_attribute_edit.xml | 4 +- .../adminhtml/layout/catalog_product_edit.xml | 10 +- .../layout/catalog_product_index.xml | 10 +- .../product/edit/attribute/search.phtml | 2 +- .../view/adminhtml/product/product.css | 41 +- .../frontend/layout/catalog_product_view.xml | 4 +- .../Catalog/view/frontend/product/list.phtml | 9 +- .../view/frontend/product/list/items.phtml | 18 +- .../view/frontend/product/listing.phtml | 10 +- .../view/{rating.phtml => review.phtml} | 1 + .../product/widget/new/content/new_grid.phtml | 6 +- .../product/widget/new/content/new_list.phtml | 6 +- .../Adminhtml/Form/Field/Customergroup.php | 23 +- .../Block/Stockqty/AbstractStockqty.php | 5 +- .../Magento/CatalogInventory/Helper/Data.php | 16 +- .../CatalogInventory/Helper/Minsaleqty.php | 28 +- .../Model/Adminhtml/Stock/Item.php | 2 +- .../Model/Config/Backend/Managestock.php | 10 +- .../CatalogInventory/Model/Indexer/Stock.php | 46 +- .../CatalogInventory/Model/Plugin/Layer.php | 12 +- .../Resource/Indexer/Stock/DefaultStock.php | 15 +- .../CatalogInventory/Model/Resource/Stock.php | 20 +- .../Model/Resource/Stock/Item.php | 19 +- .../Model/Resource/Stock/Item/Collection.php | 6 +- .../Model/Resource/Stock/Status.php | 24 +- .../Magento/CatalogInventory/Model/Stock.php | 6 +- .../CatalogInventory/Model/Stock/Item.php | 82 +- .../CatalogInventory/Model/Stock/Status.php | 12 +- .../Model/System/Config/Backend/Minqty.php | 2 +- .../System/Config/Backend/Minsaleqty.php | 10 +- .../System/Config/Backend/Qtyincrements.php | 2 +- app/code/Magento/CatalogInventory/etc/di.xml | 7 + .../Magento/CatalogInventory/etc/module.xml | 1 + .../install-1.6.0.0.php | 4 +- .../Adminhtml/Promo/Catalog/Edit/Tab/Main.php | 22 +- .../Controller/Adminhtml/Promo/Widget.php | 2 +- .../Magento/CatalogRule/Model/Observer.php | 4 +- .../CatalogRule/Model/Resource/Rule.php | 16 +- app/code/Magento/CatalogRule/Model/Rule.php | 6 +- .../data-upgrade-1.6.0.3-1.6.0.4.php | 12 +- app/code/Magento/CatalogRule/etc/di.xml | 12 +- app/code/Magento/CatalogRule/etc/module.xml | 2 +- .../sql/catalogrule_setup/install-1.6.0.0.php | 14 +- .../upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../upgrade-1.6.0.1-1.6.0.2.php | 6 +- .../upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../CatalogSearch/Controller/Result.php | 2 +- .../Magento/CatalogSearch/Controller/Term.php | 2 +- .../Magento/CatalogSearch/Helper/Data.php | 35 +- .../Magento/CatalogSearch/Model/Advanced.php | 2 +- .../Model/Config/Backend/Search/Type.php | 13 +- .../Magento/CatalogSearch/Model/Fulltext.php | 18 +- .../CatalogSearch/Model/Fulltext/Observer.php | 8 +- .../CatalogSearch/Model/Indexer/Fulltext.php | 187 +- .../Layer/Search/AvailabilityFlag/Plugin.php | 15 +- .../Magento/CatalogSearch/Model/Query.php | 36 +- .../CatalogSearch/Model/Resource/Advanced.php | 6 +- .../Model/Resource/Advanced/Collection.php | 10 +- .../Model/Resource/EngineProvider.php | 12 +- .../CatalogSearch/Model/Resource/Fulltext.php | 28 +- .../Model/Resource/Fulltext/Collection.php | 10 +- .../Model/Resource/Query/Collection.php | 8 +- .../Model/Resource/Search/Collection.php | 10 +- app/code/Magento/CatalogSearch/etc/di.xml | 34 + app/code/Magento/CatalogSearch/etc/module.xml | 1 + .../catalogsearch_setup/install-1.6.0.0.php | 6 +- app/code/Magento/Centinel/Model/Api.php | 2 +- app/code/Magento/Centinel/Model/Config.php | 24 +- app/code/Magento/Centinel/etc/module.xml | 1 + .../layout/sales_order_create_index.xml | 2 +- ...rder_create_load_block_card_validation.xml | 2 +- .../sales_order_create_load_block_data.xml | 2 +- .../adminhtml/order/create/abstract.phtml | 35 + .../view/adminhtml/validation/form.phtml | 11 +- .../Block/Adminhtml/Agreement/Edit/Form.php | 6 +- .../Magento/Checkout/Block/Agreements.php | 2 +- app/code/Magento/Checkout/Block/Cart.php | 9 +- .../Magento/Checkout/Block/Cart/Crosssell.php | 14 +- .../Magento/Checkout/Block/Cart/Shipping.php | 8 +- .../Magento/Checkout/Block/Cart/Sidebar.php | 20 +- .../Block/Onepage/AbstractOnepage.php | 7 +- .../Onepage/Shipping/Method/Available.php | 6 +- .../Checkout/Block/Total/DefaultTotal.php | 4 +- .../Magento/Checkout/Controller/Action.php | 4 +- app/code/Magento/Checkout/Controller/Cart.php | 44 +- .../Magento/Checkout/Controller/Onepage.php | 14 +- app/code/Magento/Checkout/Helper/Cart.php | 18 +- app/code/Magento/Checkout/Helper/Data.php | 91 +- app/code/Magento/Checkout/Model/Cart.php | 18 +- .../Model/Resource/Agreement/Collection.php | 4 +- .../Magento/Checkout/Model/Resource/Setup.php | 2 +- app/code/Magento/Checkout/Model/Session.php | 10 +- .../Checkout/Model/Type/AbstractType.php | 173 - .../Magento/Checkout/Model/Type/Onepage.php | 28 +- app/code/Magento/Checkout/etc/frontend/di.xml | 2 +- app/code/Magento/Checkout/etc/module.xml | 3 +- .../sql/checkout_setup/install-1.6.0.0.php | 6 +- .../Cms/Block/Adminhtml/Block/Edit/Form.php | 6 +- .../Block/Adminhtml/Page/Edit/Tab/Main.php | 6 +- app/code/Magento/Cms/Block/Block.php | 6 +- app/code/Magento/Cms/Block/Page.php | 21 +- app/code/Magento/Cms/Controller/Index.php | 15 +- app/code/Magento/Cms/Controller/Noroute.php | 8 +- app/code/Magento/Cms/Controller/Router.php | 6 +- app/code/Magento/Cms/Helper/Page.php | 6 +- .../Magento/Cms/Helper/Wysiwyg/Images.php | 6 +- app/code/Magento/Cms/Model/Observer.php | 19 +- app/code/Magento/Cms/Model/Resource/Block.php | 10 +- .../Cms/Model/Resource/Block/Collection.php | 6 +- app/code/Magento/Cms/Model/Resource/Page.php | 20 +- .../Cms/Model/Resource/Page/Collection.php | 12 +- app/code/Magento/Cms/Model/Resource/Setup.php | 8 +- app/code/Magento/Cms/Model/Wysiwyg/Config.php | 14 +- .../Cms/Model/Wysiwyg/Images/Storage.php | 2 +- .../data-upgrade-1.6.0.0.2-1.6.0.0.3.php | 20 +- app/code/Magento/Cms/etc/module.xml | 2 + .../Cms/sql/cms_setup/install-1.6.0.0.php | 10 +- .../Composite/Fieldset/Configurable.php | 2 +- .../Product/Edit/Tab/Super/Config.php | 10 +- .../Product/Edit/Tab/Super/Config/Matrix.php | 16 +- .../Block/Cart/Item/Renderer/Configurable.php | 5 +- .../Block/Product/View/Type/Configurable.php | 2 +- .../Model/Product/Type/Configurable.php | 35 +- .../Model/Product/Type/Configurable/Price.php | 4 +- .../Product/Collection/AssociatedProduct.php | 10 +- .../Resource/Product/Type/Configurable.php | 2 +- .../Product/Type/Configurable/Attribute.php | 6 +- .../Configurable/Attribute/Collection.php | 6 +- .../ConfigurableProduct/etc/module.xml | 7 +- .../ConfigurableProduct/etc/product_types.xml | 2 +- .../configurable_setup/install-1.0.0.0.php | 8 +- .../edit/super/attribute-js-template.phtml | 15 +- .../edit/super/attribute-template.phtml | 6 +- .../catalog/product/edit/super/matrix.phtml | 8 +- .../form.phtml | 50 +- .../view/adminhtml/product/product.css | 62 +- .../Controller/Adminhtml/Extension/Local.php | 2 +- app/code/Magento/Connect/Helper/Data.php | 10 +- app/code/Magento/Connect/Model/Session.php | 4 +- app/code/Magento/Connect/etc/module.xml | 1 + .../Controller/Index.php | 50 +- .../{Contacts => Contact}/Helper/Data.php | 25 +- .../Model/System/Config/Backend/Links.php | 10 +- .../etc/adminhtml/acl.xml | 4 +- .../etc/adminhtml/system.xml | 10 +- .../{Contacts => Contact}/etc/config.xml | 14 +- .../etc/email_templates.xml | 2 +- .../{Contacts => Contact}/etc/frontend/di.xml | 2 +- .../etc/frontend/page_types.xml | 2 +- .../etc/frontend/routes.xml | 4 +- .../{Contacts => Contact}/etc/module.xml | 5 +- .../{Contacts => Contact}/i18n/de_DE.csv | 0 .../{Contacts => Contact}/i18n/en_US.csv | 0 .../{Contacts => Contact}/i18n/es_ES.csv | 0 .../{Contacts => Contact}/i18n/fr_FR.csv | 0 .../{Contacts => Contact}/i18n/nl_NL.csv | 0 .../{Contacts => Contact}/i18n/pt_BR.csv | 0 .../{Contacts => Contact}/i18n/zh_CN.csv | 0 .../sql/contact_setup}/install-1.6.0.0.php | 3 - .../view/email/submitted_form.html | 0 .../view/frontend/form.phtml | 4 +- .../frontend/layout/contact_index_index.xml} | 2 +- .../view/frontend/layout/default.xml | 4 +- .../Core/App/Action/Plugin/LastUrl.php | 6 +- .../App/FrontController/Plugin/MessageBox.php | 2 +- app/code/Magento/Core/App/Media.php | 2 +- app/code/Magento/Core/App/Router/Base.php | 28 +- .../Core/App/Router/NoRouteHandler.php | 6 +- app/code/Magento/Core/Helper/Data.php | 41 +- app/code/Magento/Core/Helper/File/Storage.php | 6 +- .../Core/Helper/File/Storage/Database.php | 6 +- app/code/Magento/Core/Helper/Url.php | 6 +- .../Core/Model/App/Action/ContextPlugin.php | 8 +- app/code/Magento/Core/Model/App/Area.php | 22 +- .../Core/Model/App/Area/DesignExceptions.php | 12 +- app/code/Magento/Core/Model/App/Emulation.php | 38 +- app/code/Magento/Core/Model/Asset/Config.php | 24 +- app/code/Magento/Core/Model/Config/Cache.php | 134 - .../Core/Model/Design/Backend/Exceptions.php | 8 +- .../Core/Model/Design/Backend/Theme.php | 10 +- app/code/Magento/Core/Model/File/Storage.php | 18 +- .../Core/Model/File/Storage/Database.php | 4 +- .../Storage/Database/AbstractDatabase.php | 6 +- .../Model/File/Storage/Directory/Database.php | 4 +- .../File/Validator/NotProtectedExtension.php | 14 +- app/code/Magento/Core/Model/Layout/Merge.php | 6 +- app/code/Magento/Core/Model/Observer.php | 7 + .../Magento/Core/Model/Resource/Config.php | 2 +- .../Core/Model/Resource/Config/Data.php | 29 +- .../Model/Resource/Config/Data/Collection.php | 2 +- .../Core/Model/Resource/Design/Collection.php | 2 +- .../Core/Model/Resource/Layout/Update.php | 6 +- .../Magento/Core/Model/Resource/Setup.php | 806 +- .../Magento/Core/Model/Resource/Variable.php | 2 +- app/code/Magento/Core/Model/Session.php | 37 - app/code/Magento/Core/Model/Store/Config.php | 136 - .../Core/Model/Store/ConfigInterface.php | 30 - .../Core/Model/Store/StorageFactory.php | 159 - .../TemplateEngine/Plugin/DebugHints.php | 14 +- .../Magento/Core/Model/Theme/Collection.php | 2 +- .../Core/Model/Theme/Customization/Config.php | 6 +- .../Magento/Core/Model/Theme/Image/Path.php | 6 +- .../Magento/Core/Model/Theme/Resolver.php | 84 + .../Core/Model/Url/RouteParamsResolver.php | 21 +- .../Magento/Core/Model/Url/ScopeResolver.php | 6 +- .../Magento/Core/Model/Url/SecurityInfo.php | 22 +- app/code/Magento/Core/Model/Variable.php | 2 +- app/code/Magento/Core/Model/View/Design.php | 31 +- .../Magento/Core/Model/View/Url/Config.php | 12 +- .../data-upgrade-1.6.0.10-1.6.0.11.php | 4 +- .../data-upgrade-1.6.0.12-1.6.0.13.php | 4 +- .../data-upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../data-upgrade-1.6.0.3-1.6.0.4.php | 12 +- .../data-upgrade-1.6.0.4-1.6.0.5.php | 2 +- .../data-upgrade-1.6.0.5-1.6.0.6.php | 2 +- app/code/Magento/Core/etc/di.xml | 187 +- app/code/Magento/Core/etc/frontend/di.xml | 7 +- app/code/Magento/Core/etc/module.xml | 13 +- .../Core/sql/core_setup/install-1.6.0.0.php | 279 +- .../oracle-upgrade-1.6.0.0-1.6.0.1.php | 51 - .../core_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../core_setup/upgrade-1.6.0.10-1.6.0.11.php | 2 +- .../core_setup/upgrade-1.6.0.11-1.6.0.12.php | 2 +- .../core_setup/upgrade-1.6.0.12-1.6.0.13.php | 2 +- .../core_setup/upgrade-1.6.0.13-1.6.0.14.php | 2 +- .../core_setup/upgrade-1.6.0.14-1.6.0.15.php | 2 +- .../core_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../core_setup/upgrade-1.6.0.3-1.6.0.4.php | 2 +- .../core_setup/upgrade-1.6.0.5-1.6.0.6.php | 8 +- .../core_setup/upgrade-1.6.0.6-1.6.0.7.php | 8 +- .../core_setup/upgrade-1.6.0.7-1.6.0.8.php | 2 +- .../core_setup/upgrade-1.6.0.8-1.6.0.9.php | 2 +- .../core_setup/upgrade-1.6.0.9-1.6.0.10.php | 2 +- .../Model/Config/Backend/Product/Alert.php | 16 +- .../Cron/Model/Config/Backend/Sitemap.php | 16 +- app/code/Magento/Cron/Model/Observer.php | 73 +- app/code/Magento/Cron/etc/cron_groups.xml | 2 +- app/code/Magento/Cron/etc/di.xml | 13 +- app/code/Magento/Cron/etc/module.xml | 4 +- .../Cron/sql/cron_setup/install-1.6.0.0.php | 2 +- .../Block/Adminhtml/System/Currency.php | 6 +- .../Block/Adminhtml/System/Currencysymbol.php | 34 +- .../Magento/CurrencySymbol/Helper/Data.php | 10 +- .../Model/System/Currencysymbol.php | 50 +- app/code/Magento/CurrencySymbol/etc/di.xml | 34 + .../Magento/CurrencySymbol/etc/module.xml | 1 + .../CurrencySymbol/view/adminhtml/grid.phtml | 1 - .../Magento/Customer/Block/Address/Edit.php | 11 +- .../Magento/Customer/Block/Adminhtml/Edit.php | 2 +- .../Block/Adminhtml/Edit/Tab/Account.php | 6 +- .../Block/Adminhtml/Edit/Tab/Addresses.php | 4 +- .../Block/Adminhtml/Edit/Tab/Cart.php | 10 +- .../Block/Adminhtml/Edit/Tab/View.php | 17 +- .../Block/Adminhtml/Edit/Tab/View/Cart.php | 10 +- .../Block/Adminhtml/Edit/Tab/View/Sales.php | 5 +- .../Customer/Block/Adminhtml/Edit/Tabs.php | 3 +- .../Magento/Customer/Block/Form/Register.php | 2 +- .../Magento/Customer/Block/Widget/Dob.php | 19 +- .../Magento/Customer/Block/Widget/Name.php | 10 +- .../Magento/Customer/Controller/Account.php | 40 +- .../Adminhtml/Cart/Product/Composite/Cart.php | 2 +- .../Customer/Controller/Adminhtml/Index.php | 24 +- app/code/Magento/Customer/Helper/Address.php | 60 +- app/code/Magento/Customer/Helper/Data.php | 197 +- .../Magento/Customer/Model/Address/Config.php | 22 +- .../Model/Config/Backend/Address/Street.php | 26 +- .../Password/Link/Expirationperiod.php | 2 +- .../Model/Config/Backend/Show/Customer.php | 20 +- .../Magento/Customer/Model/Config/Share.php | 31 +- app/code/Magento/Customer/Model/Converter.php | 1 + app/code/Magento/Customer/Model/Customer.php | 68 +- .../Customer/Attribute/Backend/Store.php | 6 +- .../Customer/Attribute/Backend/Website.php | 6 +- .../Model/Customer/Attribute/Source/Store.php | 14 +- .../Customer/Attribute/Source/Website.php | 6 +- app/code/Magento/Customer/Model/Group.php | 12 +- .../Resource/AbstractServiceCollection.php | 4 +- .../Customer/Model/Resource/Customer.php | 15 +- .../Customer/Grid/ServiceCollection.php | 2 +- .../Resource/Group/Grid/ServiceCollection.php | 2 +- .../Magento/Customer/Model/Resource/Setup.php | 2 +- app/code/Magento/Customer/Model/Session.php | 20 +- .../Customer/Model/Session/Storage.php | 4 +- .../Service/V1/CustomerAccountService.php | 217 +- .../V1/CustomerAccountServiceInterface.php | 39 +- .../Service/V1/CustomerAddressService.php | 1 + .../V1/CustomerAddressServiceInterface.php | 2 +- .../Service/V1/CustomerGroupService.php | 164 +- .../V1/CustomerGroupServiceInterface.php | 4 + .../Service/V1/CustomerMetadataService.php | 105 +- .../Customer/Service/V1/Data/Customer.php | 30 +- .../V1/Data/CustomerValidationResults.php | 56 + .../Data/CustomerValidationResultsBuilder.php | 52 + .../V1/Data/Search/AbstractFilterGroup.php | 37 +- .../Search/AbstractFilterGroupBuilder.php | 121 +- .../Service/V1/Data/Search/AndGroup.php | 7 - .../Service/V1/Data/Search/OrGroup.php | 7 - .../Service/V1/Data/SearchCriteria.php | 13 +- .../Service/V1/Data/SearchCriteriaBuilder.php | 54 +- .../data-upgrade-1.6.2.0.1-1.6.2.0.2.php | 9 +- app/code/Magento/Customer/etc/di.xml | 21 +- app/code/Magento/Customer/etc/frontend/di.xml | 2 +- app/code/Magento/Customer/etc/module.xml | 2 +- app/code/Magento/Customer/etc/webapi.xml | 1 - .../sql/customer_setup/install-1.6.0.0.php | 12 +- .../mysql4-upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../upgrade-1.6.2.0-1.6.2.0.1.php | 2 +- .../adminhtml/layout/customer_group_index.xml | 2 +- .../Editor/Form/Renderer/LogoUploader.php | 10 +- .../DesignEditor/Block/Adminhtml/Theme.php | 2 +- .../Adminhtml/Theme/Selector/StoreView.php | 16 +- .../Adminhtml/System/Design/Editor.php | 6 +- .../Adminhtml/System/Design/Editor/Tools.php | 10 +- .../Controller/Varien/Router/Standard.php | 10 +- .../DesignEditor/Model/AreaEmulator.php | 2 +- app/code/Magento/DesignEditor/Model/State.php | 24 +- .../DesignEditor/Model/Translate/Inline.php | 6 +- .../DesignEditor/Model/Url/NavigationMode.php | 6 + app/code/Magento/DesignEditor/etc/di.xml | 5 + app/code/Magento/DesignEditor/etc/module.xml | 1 + .../designeditor_setup/install-1.0.0.1.php | 2 +- .../upgrade-1.0.0.1-1.0.0.2.php | 2 +- .../upgrade-1.0.0.2-1.0.0.3.php | 2 +- .../view/adminhtml/css/styles.css | 4 +- .../view/frontend/translate_inline.phtml | 2 +- app/code/Magento/Dhl/Model/Carrier.php | 55 +- .../Plugin/Checkout/Block/Cart/Shipping.php | 14 +- .../Rma/Edit/Tab/General/Shippingmethod.php | 10 +- app/code/Magento/Dhl/Model/Resource/Setup.php | 8 +- app/code/Magento/Dhl/etc/module.xml | 1 + .../Adminhtml/Frontend/Currency/Base.php | 7 +- .../Magento/Directory/Controller/Currency.php | 4 +- app/code/Magento/Directory/Helper/Data.php | 28 +- app/code/Magento/Directory/Helper/Url.php | 75 + app/code/Magento/Directory/Model/Currency.php | 6 +- .../Model/Currency/DefaultLocator.php | 38 +- .../Directory/Model/Currency/Filter.php | 6 +- .../Model/Currency/Import/Webservicex.php | 17 +- app/code/Magento/Directory/Model/Observer.php | 53 +- .../Model/Resource/Country/Collection.php | 12 +- .../Directory/Model/Resource/Setup.php | 8 +- .../directory_setup/data-install-1.6.0.0.php | 2 +- app/code/Magento/Directory/etc/module.xml | 2 + .../sql/directory_setup/install-1.6.0.0.php | 2 +- .../Product/Edit/Tab/Downloadable/Links.php | 19 +- .../Product/Edit/Tab/Downloadable/Samples.php | 9 +- .../Sales/Items/Column/Downloadable/Name.php | 2 +- .../Block/Catalog/Product/Links.php | 4 +- .../Block/Catalog/Product/Samples.php | 4 +- .../Block/Customer/Products/ListProducts.php | 2 +- .../Sales/Order/Email/Items/Downloadable.php | 2 +- .../Order/Email/Items/Order/Downloadable.php | 2 +- .../Order/Item/Renderer/Downloadable.php | 2 +- .../Downloadable/Controller/Download.php | 4 +- .../Helper/Catalog/Product/Configuration.php | 12 +- app/code/Magento/Downloadable/Helper/Data.php | 15 +- .../Magento/Downloadable/Helper/Download.php | 12 +- .../Magento/Downloadable/Model/Observer.php | 66 +- .../Downloadable/Model/Resource/Link.php | 12 +- .../Sales/Order/Pdf/Items/AbstractItems.php | 12 +- .../Sales/Order/Pdf/Items/Creditmemo.php | 6 +- .../Model/Sales/Order/Pdf/Items/Invoice.php | 6 +- app/code/Magento/Downloadable/etc/module.xml | 1 + .../Downloadable/etc/product_types.xml | 2 +- .../downloadable_setup/install-1.6.0.0.php | 12 +- .../Attribute/Edit/Options/Labels.php | 2 +- .../Attribute/Edit/Options/Options.php | 6 +- app/code/Magento/Eav/Helper/Data.php | 12 +- app/code/Magento/Eav/Model/Attribute.php | 2 +- .../Eav/Model/Entity/AbstractEntity.php | 2 +- .../Magento/Eav/Model/Entity/Attribute.php | 21 +- .../Entity/Attribute/AbstractAttribute.php | 6 +- .../Model/Entity/Attribute/Backend/Store.php | 6 +- .../Model/Entity/Attribute/Source/Store.php | 6 +- .../Entity/Collection/AbstractCollection.php | 4 +- app/code/Magento/Eav/Model/Entity/Setup.php | 15 +- .../Eav/Model/Entity/Setup/Context.php | 12 +- app/code/Magento/Eav/Model/Form.php | 12 +- app/code/Magento/Eav/Model/Form/Fieldset.php | 6 +- .../Model/Resource/Attribute/Collection.php | 8 +- .../Magento/Eav/Model/Resource/Config.php | 2 +- .../Eav/Model/Resource/Entity/Attribute.php | 8 +- .../Resource/Entity/Attribute/Option.php | 2 +- .../Entity/Attribute/Option/Collection.php | 6 +- .../Resource/Form/Attribute/Collection.php | 12 +- .../Resource/Form/Fieldset/Collection.php | 6 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 36 +- app/code/Magento/Eav/etc/module.xml | 2 + .../Eav/sql/eav_setup/install-1.6.0.0.php | 44 +- .../Email/Block/Adminhtml/Template.php | 4 +- .../Email/Block/Adminhtml/Template/Edit.php | 178 +- .../Magento/Email/Model/AbstractTemplate.php | 6 +- .../Magento/Email/Model/BackendTemplate.php | 20 +- .../Magento/Email/Model/Source/Variables.php | 4 +- app/code/Magento/Email/Model/Template.php | 46 +- .../Magento/Email/Model/Template/Filter.php | 35 +- .../Email/Model/Template/SenderResolver.php | 22 +- app/code/Magento/Email/etc/module.xml | 8 +- .../Email/sql/email_setup/install-1.0.0.0.php | 2 +- .../Email/view/adminhtml/template/edit.phtml | 13 - app/code/Magento/Fedex/Model/Carrier.php | 102 +- .../Rma/Edit/Tab/General/Shippingmethod.php | 10 +- app/code/Magento/Fedex/etc/di.xml | 7 - app/code/Magento/Fedex/etc/module.xml | 1 + .../Fedex/sql/fedex_setup/install-2.0.0.0.php | 4 +- .../Adminhtml/Product/Helper/Form/Config.php | 15 +- .../Magento/GiftMessage/Helper/Message.php | 26 +- .../GiftMessage/Model/Resource/Setup.php | 6 +- app/code/Magento/GiftMessage/etc/di.xml | 7 + app/code/Magento/GiftMessage/etc/module.xml | 1 + .../Magento/GoogleAdwords/Helper/Data.php | 56 +- .../Config/Backend/AbstractConversion.php | 10 +- app/code/Magento/GoogleAdwords/etc/module.xml | 2 +- app/code/Magento/GoogleAnalytics/Block/Ga.php | 6 +- .../Magento/GoogleAnalytics/Helper/Data.php | 16 +- .../GoogleAnalytics/Model/Observer.php | 6 +- app/code/Magento/GoogleAnalytics/etc/di.xml | 34 + .../Magento/GoogleAnalytics/etc/module.xml | 3 +- .../GoogleAnalytics/view/frontend/ga.phtml | 2 +- .../Magento/GoogleOptimizer/Helper/Data.php | 12 +- .../Magento/GoogleOptimizer/etc/module.xml | 2 +- .../googleoptimizer_setup/install-2.0.0.0.php | 6 +- .../GoogleShopping/Block/Adminhtml/Items.php | 22 +- .../Block/Adminhtml/Items/Product.php | 2 +- .../Adminhtml/Googleshopping/Items.php | 6 +- .../Adminhtml/Googleshopping/Types.php | 6 +- .../Magento/GoogleShopping/Helper/Data.php | 6 +- .../GoogleShopping/Model/Attribute/Link.php | 12 +- .../GoogleShopping/Model/Attribute/Price.php | 35 +- .../Magento/GoogleShopping/Model/Config.php | 18 +- .../GoogleShopping/Model/MassOperations.php | 6 +- .../Magento/GoogleShopping/Model/Observer.php | 12 +- .../GoogleShopping/Model/Resource/Setup.php | 8 +- .../Magento/GoogleShopping/etc/module.xml | 1 + .../googleshopping_setup/install-1.6.0.0.php | 6 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 2 +- .../GoogleShopping/view/adminhtml/items.phtml | 1 - .../adminhtml_googleshopping_items_index.xml | 5 + .../Block/Cart/Item/Renderer/Grouped.php | 5 +- .../Model/Product/CatalogPrice.php | 12 +- .../Model/Product/Type/Grouped.php | 6 +- .../Grouped/AssociatedProductsCollection.php | 10 +- .../Magento/GroupedProduct/etc/module.xml | 7 +- .../GroupedProduct/etc/product_types.xml | 2 +- .../view/adminhtml/css/grouped-product.css | 4 + app/code/Magento/ImportExport/Helper/Data.php | 14 +- .../Model/Export/AbstractEntity.php | 25 +- .../Model/Export/Entity/AbstractEav.php | 12 +- .../Model/Export/Entity/AbstractEntity.php | 8 +- .../Model/Export/Entity/Eav/Customer.php | 10 +- .../Export/Entity/Eav/Customer/Address.php | 10 +- .../Model/Export/Entity/Product.php | 33 +- .../Magento/ImportExport/Model/Import.php | 4 +- .../Model/Import/AbstractEntity.php | 20 +- .../Model/Import/Entity/AbstractEav.php | 18 +- .../Model/Import/Entity/AbstractEntity.php | 2 +- .../Model/Import/Entity/CustomerComposite.php | 6 +- .../Import/Entity/Eav/AbstractCustomer.php | 10 +- .../Model/Import/Entity/Eav/Customer.php | 10 +- .../Import/Entity/Eav/Customer/Address.php | 10 +- .../Model/Import/Entity/Product.php | 10 +- .../Model/Import/Entity/Product/Option.php | 41 +- app/code/Magento/ImportExport/etc/di.xml | 7 + app/code/Magento/ImportExport/etc/module.xml | 1 + .../importexport_setup/install-1.6.0.0.php | 2 +- .../mysql4-upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../upgrade-1.6.0.3-1.6.0.4.php | 2 +- app/code/Magento/Index/Model/Observer.php | 12 +- .../Magento/Index/Model/Resource/Setup.php | 8 +- app/code/Magento/Index/etc/events.xml | 2 +- app/code/Magento/Index/etc/module.xml | 3 +- .../Indexer/Block/Backend/Container.php | 11 - .../Indexer/Model/Mview/View/State.php | 2 +- app/code/Magento/Indexer/etc/cron_groups.xml | 2 +- app/code/Magento/Indexer/etc/module.xml | 4 + .../sql/indexer_setup/install-1.0.0.0.php | 2 +- .../Install/App/Action/Plugin/Design.php | 14 +- app/code/Magento/Install/Block/End.php | 8 - .../Magento/Install/Controller/Wizard.php | 4 +- app/code/Magento/Install/Model/Installer.php | 66 +- .../Install/Model/Installer/Config.php | 6 +- .../Install/Model/Resource/Resource.php | 2 +- app/code/Magento/Install/Model/Setup.php | 49 + app/code/Magento/Install/etc/di.xml | 6 + app/code/Magento/Install/etc/module.xml | 2 + .../Magento/Install/view/install/page.phtml | 1 + .../Block/Adminhtml/Integration/Edit.php | 2 +- .../Magento/Integration/Helper/Oauth/Data.php | 35 +- .../Integration/Model/Resource/Setup.php | 8 +- .../Magento/Integration/Service/OauthV1.php | 6 +- app/code/Magento/Integration/etc/module.xml | 2 + .../sql/integration_setup/install-1.0.0.0.php | 2 +- app/code/Magento/Log/Model/Aggregation.php | 6 +- app/code/Magento/Log/Model/Cron.php | 46 +- app/code/Magento/Log/Model/Log.php | 15 +- .../Magento/Log/Model/Resource/Visitor.php | 6 +- .../Magento/Log/Model/Shell/Command/Clean.php | 24 +- app/code/Magento/Log/Model/Visitor.php | 36 +- app/code/Magento/Log/Model/Visitor/Online.php | 22 +- .../data/log_setup/data-install-1.6.0.0.php | 2 +- app/code/Magento/Log/etc/di.xml | 2 +- app/code/Magento/Log/etc/frontend/events.xml | 2 +- app/code/Magento/Log/etc/module.xml | 2 + .../Log/sql/log_setup/install-1.6.0.0.php | 2 +- .../Block/Checkout/Addresses.php | 70 +- .../Multishipping/Block/Checkout/Shipping.php | 8 +- .../Magento/Multishipping/Helper/Data.php | 14 +- .../Model/Checkout/Type/Multishipping.php | 180 +- .../Method/Specification/Is3DSecure.php | 18 +- app/code/Magento/Multishipping/etc/module.xml | 2 + .../Newsletter/Block/Adminhtml/Queue/Edit.php | 42 +- .../Block/Adminhtml/Queue/Edit/Form.php | 6 +- .../Subscriber/Grid/Filter/Website.php | 14 +- .../Newsletter/Block/Adminhtml/Template.php | 10 + .../Block/Adminhtml/Template/Edit.php | 196 +- .../Block/Adminhtml/Template/Edit/Form.php | 15 +- .../Grid/Options/GroupOptionHash.php | 6 +- .../Grid/Options/StoreOptionHash.php | 6 +- .../Newsletter/Controller/Adminhtml/Queue.php | 6 +- .../Controller/Adminhtml/Template.php | 7 +- .../Magento/Newsletter/Controller/Manage.php | 6 +- .../Newsletter/Controller/Subscriber.php | 15 +- .../Model/Plugin/CustomerPlugin.php | 14 +- app/code/Magento/Newsletter/Model/Queue.php | 4 +- .../Newsletter/Model/Resource/Setup.php | 64 - .../Model/Resource/Subscriber/Collection.php | 2 +- .../Magento/Newsletter/Model/Subscriber.php | 176 +- .../Magento/Newsletter/Model/Template.php | 21 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../data-upgrade-1.6.0.1-1.6.0.2.php | 16 +- app/code/Magento/Newsletter/etc/di.xml | 7 - app/code/Magento/Newsletter/etc/module.xml | 2 + .../sql/newsletter_setup/install-1.6.0.0.php | 10 +- .../layout/newsletter_queue_preview.xml | 2 +- .../layout/newsletter_template_preview.xml | 2 +- .../adminhtml/preview/iframeswitcher.phtml | 1 - .../view/adminhtml/queue/list.phtml | 1 - .../view/adminhtml/template/edit.phtml | 16 - .../view/adminhtml/template/list.phtml | 5 - .../Magento/OfflinePayments/etc/config.xml | 3 + .../Magento/OfflinePayments/etc/module.xml | 1 + .../Controller/Adminhtml/System/Config.php | 6 +- .../Model/Carrier/Flatrate.php | 6 +- .../Model/Carrier/Freeshipping.php | 6 +- .../OfflineShipping/Model/Carrier/Pickup.php | 6 +- .../Model/Carrier/Tablerate.php | 6 +- .../Model/Config/Backend/Tablerate.php | 10 +- .../Plugin/Checkout/Block/Cart/Shipping.php | 12 +- .../Model/Quote/Freeshipping.php | 6 +- .../Model/Resource/Carrier/Tablerate.php | 12 +- app/code/Magento/OfflineShipping/etc/di.xml | 7 - .../Magento/OfflineShipping/etc/module.xml | 4 +- .../offlineshipping_setup/install-2.0.0.0.php | 2 +- app/code/Magento/Ogone/Model/Api.php | 12 +- app/code/Magento/Ogone/Model/Config.php | 12 +- app/code/Magento/Ogone/etc/module.xml | 2 +- .../Ogone/sql/ogone_setup/install-1.6.0.0.php | 2 +- .../Block/System/Config/Form/Field/Export.php | 21 +- .../App/FrontController/BuiltinPlugin.php | 2 +- .../App/FrontController/VarnishPlugin.php | 2 +- app/code/Magento/PageCache/Model/Config.php | 47 +- .../PageCache/Model/Layout/LayoutPlugin.php | 18 +- app/code/Magento/PageCache/Model/Observer.php | 10 +- .../Model/System/Config/Backend/Ttl.php | 2 +- .../Model/System/Config/Backend/Varnish.php | 2 +- .../Magento/PageCache/etc/frontend/di.xml | 2 +- app/code/Magento/PageCache/etc/module.xml | 3 +- .../PayPalRecurringPayment/etc/module.xml | 4 +- app/code/Magento/Payment/Block/Info.php | 2 +- .../Payment/Block/Info/Substitution.php | 54 + app/code/Magento/Payment/Helper/Data.php | 45 +- app/code/Magento/Payment/Model/Config.php | 27 +- app/code/Magento/Payment/Model/Info.php | 11 +- .../Payment/Model/Method/AbstractMethod.php | 18 +- app/code/Magento/Payment/Model/Method/Cc.php | 6 +- .../Magento/Payment/Model/Method/Free.php | 12 +- .../Model/Method/Substitution.php} | 42 +- app/code/Magento/Payment/etc/config.xml | 6 +- app/code/Magento/Payment/etc/module.xml | 2 + .../view/adminhtml/info/substitution.phtml | 10 +- .../System/Config/Fieldset/Store.php | 10 +- .../Magento/Paypal/Block/Express/Review.php | 22 +- .../Paypal/Controller/Billing/Agreement.php | 30 +- .../Controller/Express/AbstractExpress.php | 95 +- app/code/Magento/Paypal/Helper/Data.php | 2 +- .../Paypal/Model/Billing/Agreement.php | 64 +- app/code/Magento/Paypal/Model/Config.php | 47 +- app/code/Magento/Paypal/Model/Direct.php | 14 +- app/code/Magento/Paypal/Model/Express.php | 24 +- .../Magento/Paypal/Model/Express/Checkout.php | 356 +- app/code/Magento/Paypal/Model/Hostedpro.php | 10 +- .../Magento/Paypal/Model/Method/Agreement.php | 14 +- .../Magento/Paypal/Model/PayflowExpress.php | 10 +- app/code/Magento/Paypal/Model/Payflowlink.php | 36 +- app/code/Magento/Paypal/Model/Payflowpro.php | 12 +- .../Method/Billing/AbstractAgreement.php | 6 +- .../Paypal/Model/Report/Settlement.php | 64 +- app/code/Magento/Paypal/Model/Standard.php | 12 +- .../Model/System/Config/Backend/Cert.php | 10 +- .../Model/System/Config/Backend/Cron.php | 16 +- .../System/Config/Backend/MerchantCountry.php | 18 +- app/code/Magento/Paypal/etc/module.xml | 1 + .../sql/paypal_setup/install-1.6.0.0.php | 8 +- .../paypal_setup/upgrade-1.6.0.2-1.6.0.3.php | 2 +- .../frontend/express/review/address.phtml | 17 +- .../Paypal/view/frontend/hss/form.phtml | 1 + .../Paypal/view/frontend/hss/redirect.phtml | 1 + .../Paypal/view/frontend/order-review.js | 2 +- .../view/frontend/payflowadvanced/form.phtml | 1 + .../frontend/payflowadvanced/redirect.phtml | 1 + .../view/frontend/payflowlink/form.phtml | 1 + app/code/Magento/Persistent/Helper/Data.php | 57 +- .../Magento/Persistent/Helper/Session.php | 10 +- .../Magento/Persistent/Model/Observer.php | 6 +- app/code/Magento/Persistent/Model/Session.php | 14 +- app/code/Magento/Persistent/etc/module.xml | 1 + .../sql/persistent_setup/install-1.0.0.0.php | 6 +- .../Block/Email/AbstractEmail.php | 10 +- .../Magento/ProductAlert/Controller/Add.php | 10 +- .../ProductAlert/Controller/Unsubscribe.php | 8 +- app/code/Magento/ProductAlert/Helper/Data.php | 20 +- app/code/Magento/ProductAlert/Model/Email.php | 46 +- .../Magento/ProductAlert/Model/Observer.php | 47 +- .../Model/Resource/Price/Collection.php | 2 +- .../Model/Resource/Stock/Collection.php | 2 +- .../events.xml => ProductAlert/etc/di.xml} | 12 +- app/code/Magento/ProductAlert/etc/module.xml | 1 + .../productalert_setup/install-1.6.0.0.php | 10 +- .../Block/Adminhtml/Edit/Tab/Options.php | 102 - app/code/Magento/Rating/Model/Observer.php | 60 - .../rating_setup/data-install-1.6.0.0.php | 66 - app/code/Magento/Rating/etc/adminhtml/acl.xml | 40 - .../Magento/Rating/etc/adminhtml/routes.xml | 32 - app/code/Magento/Rating/i18n/de_DE.csv | 29 - app/code/Magento/Rating/i18n/en_US.csv | 29 - app/code/Magento/Rating/i18n/es_ES.csv | 29 - app/code/Magento/Rating/i18n/fr_FR.csv | 29 - app/code/Magento/Rating/i18n/nl_NL.csv | 29 - app/code/Magento/Rating/i18n/pt_BR.csv | 29 - app/code/Magento/Rating/i18n/zh_CN.csv | 29 - .../sql/rating_setup/install-1.6.0.0.php | 423 - .../rating_setup/upgrade-1.6.0.0-1.6.0.1.php | 39 - .../RecurringPayment/Model/Observer.php | 6 +- .../Model/RecurringPayment.php | 6 +- .../Magento/RecurringPayment/etc/module.xml | 1 + .../install-1.0.0.0.php | 4 +- .../Block/Adminhtml/Product/Downloads.php | 39 - .../Block/Adminhtml/Product/Lowstock.php | 40 - .../Block/Adminhtml/Shopcart/Abandoned.php | 40 - .../Reports/Block/Product/Compared.php | 2 +- .../Magento/Reports/Block/Product/Viewed.php | 2 +- .../Controller/Adminhtml/Report/Customer.php | 16 +- .../Controller/Adminhtml/Report/Product.php | 16 +- .../Controller/Adminhtml/Report/Sales.php | 28 +- .../Controller/Adminhtml/Report/Shopcart.php | 8 +- app/code/Magento/Reports/Model/Config.php | 6 +- .../Magento/Reports/Model/Event/Observer.php | 6 +- .../Model/Product/Index/AbstractIndex.php | 6 +- .../Reports/Model/Product/Index/Compared.php | 4 +- .../Magento/Reports/Model/Resource/Event.php | 21 +- .../Model/Resource/Order/Collection.php | 44 +- .../Model/Resource/Product/Collection.php | 10 +- .../Index/Collection/AbstractCollection.php | 10 +- .../Resource/Product/Lowstock/Collection.php | 16 +- .../Model/Resource/Quote/Collection.php | 2 +- .../Model/Resource/Report/AbstractReport.php | 4 +- .../Report/Product/Viewed/Collection.php | 4 +- .../Resource/Review/Customer/Collection.php | 8 +- .../Magento/Reports/Model/Resource/Setup.php | 8 +- app/code/Magento/Reports/etc/module.xml | 2 +- .../sql/reports_setup/install-1.6.0.0.php | 14 +- .../reports_setup/mysql4-install-1.6.0.0.php | 10 +- .../upgrade-1.6.0.0-1.6.0.0.1.php | 6 +- .../upgrade-1.6.0.0.1-1.6.0.0.2.php | 2 +- .../Magento/Reports/view/adminhtml/grid.phtml | 3 - .../adminhtml/layout/reports_report_grid.xml | 24 +- .../reports_report_product_downloads.xml | 43 + .../reports_report_product_lowstock.xml | 16 + .../layout/reports_report_product_viewed.xml | 20 +- .../reports_report_sales_bestsellers.xml | 20 +- .../layout/reports_report_sales_coupons.xml | 20 +- .../layout/reports_report_sales_invoiced.xml | 20 +- .../layout/reports_report_sales_refunded.xml | 20 +- .../layout/reports_report_sales_sales.xml | 20 +- .../layout/reports_report_sales_shipping.xml | 20 +- .../layout/reports_report_sales_tax.xml | 20 +- .../reports_report_shopcart_abandoned.xml} | 16 +- .../adminhtml/report/grid/container.phtml | 4 - .../frontend/product/widget/viewed/item.phtml | 4 +- .../compared/content/compared_grid.phtml | 4 +- .../compared/content/compared_list.phtml | 4 +- .../widget/viewed/content/viewed_grid.phtml | 4 +- .../widget/viewed/content/viewed_list.phtml | 4 +- .../Review/Block/Adminhtml/Add/Form.php | 6 +- .../Review/Block/Adminhtml/Edit/Form.php | 8 +- .../Block/Adminhtml/Grid/Renderer/Type.php | 2 +- .../Review/Block/Adminhtml/Product/Grid.php | 12 +- .../Block/Adminhtml/Rating.php | 8 +- .../Block/Adminhtml/Rating/Detailed.php | 24 +- .../Block/Adminhtml/Rating}/Edit.php | 16 +- .../Block/Adminhtml/Rating}/Edit/Form.php | 6 +- .../Block/Adminhtml/Rating}/Edit/Tab/Form.php | 16 +- .../Block/Adminhtml/Rating}/Edit/Tabs.php | 18 +- .../Review/Block/Adminhtml/Rating/Summary.php | 16 +- .../Magento/Review/Block/Customer/View.php | 34 +- app/code/Magento/Review/Block/Form.php | 8 +- .../Compare/ListCompare/Plugin/Review.php | 76 + .../Review/Block/Product/ReviewRenderer.php | 12 +- .../Magento/Review/Block/Product/View.php | 2 +- .../Block/Rating}/Entity/Detailed.php | 12 +- app/code/Magento/Review/Block/View.php | 33 +- .../Review/Controller/Adminhtml/Product.php | 12 +- .../Controller/Adminhtml/Rating.php} | 36 +- .../Magento/Review/Controller/Product.php | 28 +- app/code/Magento/Review/Helper/Data.php | 12 +- app/code/Magento/Review/Model/Observer.php | 15 +- .../{Rating => Review}/Model/Rating.php | 28 +- .../Model/Rating/Entity.php | 14 +- .../Model/Rating/Option.php | 20 +- .../Model/Rating/Option/Vote.php | 8 +- .../Model/Resource/Rating.php | 41 +- .../Model/Resource/Rating/Collection.php | 22 +- .../Model/Resource/Rating/Entity.php | 6 +- .../Model/Resource/Rating/Grid/Collection.php | 16 +- .../Model/Resource/Rating/Option.php | 16 +- .../Resource/Rating/Option/Collection.php | 8 +- .../Model/Resource/Rating/Option/Vote.php | 6 +- .../Rating/Option/Vote/Collection.php | 22 +- .../Magento/Review/Model/Resource/Review.php | 18 +- .../Model/Resource/Review/Collection.php | 12 +- .../Resource/Review/Product/Collection.php | 26 +- app/code/Magento/Review/Model/Review.php | 8 +- .../review_setup/data-install-1.6.0.0.php | 32 +- app/code/Magento/Review/etc/adminhtml/acl.xml | 5 + app/code/Magento/Review/etc/adminhtml/di.xml | 5 + .../Magento/Review/etc/adminhtml/menu.xml | 2 +- app/code/Magento/Review/etc/di.xml | 7 + app/code/Magento/Review/etc/frontend/di.xml | 3 + app/code/Magento/Review/etc/module.xml | 3 +- app/code/Magento/Review/i18n/de_DE.csv | 29 + app/code/Magento/Review/i18n/en_US.csv | 29 + app/code/Magento/Review/i18n/es_ES.csv | 29 + app/code/Magento/Review/i18n/fr_FR.csv | 29 + app/code/Magento/Review/i18n/nl_NL.csv | 29 + app/code/Magento/Review/i18n/pt_BR.csv | 29 + app/code/Magento/Review/i18n/zh_CN.csv | 29 + .../sql/review_setup/install-1.6.0.0.php | 404 +- .../view/adminhtml/js/rating.js | 0 .../view/adminhtml/layout/rating_block.xml | 4 +- .../adminhtml/layout/review_product_new.xml | 2 +- .../adminhtml/layout/review_rating_index.xml} | 2 +- .../view/adminhtml/rating/detailed.phtml | 2 +- .../view/adminhtml/rating/options.phtml | 0 .../adminhtml/rating/stars/detailed.phtml | 0 .../view/adminhtml/rating/stars/summary.phtml | 0 .../view/adminhtml/rating/validation-rules.js | 2 +- .../view/frontend/detailed.phtml | 0 .../view/frontend/empty.phtml | 0 .../Magento/Rss/Block/Catalog/NewCatalog.php | 6 +- .../Magento/Rss/Block/Catalog/NotifyStock.php | 5 +- app/code/Magento/Rss/Block/Catalog/Review.php | 6 +- .../Magento/Rss/Block/Catalog/Salesrule.php | 13 +- .../Magento/Rss/Block/Catalog/Special.php | 2 +- app/code/Magento/Rss/Block/ListBlock.php | 8 +- app/code/Magento/Rss/Block/Wishlist.php | 15 +- app/code/Magento/Rss/Controller/Catalog.php | 16 +- app/code/Magento/Rss/Controller/Index.php | 18 +- app/code/Magento/Rss/Helper/Order.php | 12 +- app/code/Magento/Rss/Helper/WishlistRss.php | 54 +- .../Rss/Model/System/Config/Backend/Links.php | 10 +- app/code/Magento/Rss/etc/module.xml | 1 + .../Rule/Collection/AbstractCollection.php | 4 +- app/code/Magento/Rule/etc/module.xml | 3 +- .../Block/Adminhtml/Items/AbstractItems.php | 16 +- .../Adminhtml/Order/Create/AbstractCreate.php | 2 +- .../Adminhtml/Order/Create/Form/Address.php | 2 +- .../Adminhtml/Order/Create/Items/Grid.php | 2 +- .../Adminhtml/Order/Create/Search/Grid.php | 2 +- .../Order/Create/Shipping/Method/Form.php | 7 +- .../Order/Create/Totals/DefaultTotals.php | 2 +- .../Adminhtml/Order/Create/Totals/Table.php | 2 +- .../Order/Creditmemo/Create/Items.php | 10 +- .../Block/Adminhtml/Order/Creditmemo/View.php | 7 +- .../Block/Adminhtml/Order/Invoice/View.php | 9 +- .../Block/Adminhtml/Order/Totals/Tax.php | 2 +- .../Sales/Block/Adminhtml/Order/View.php | 34 +- .../Sales/Block/Adminhtml/Order/View/Info.php | 6 +- .../Sales/Controller/Adminhtml/Creditmemo.php | 6 +- .../Sales/Controller/Adminhtml/Invoice.php | 4 +- .../Sales/Controller/Adminhtml/Shipment.php | 4 +- app/code/Magento/Sales/Helper/Admin.php | 6 +- app/code/Magento/Sales/Helper/Data.php | 29 +- app/code/Magento/Sales/Helper/Guest.php | 10 +- app/code/Magento/Sales/Helper/Reorder.php | 14 +- .../Magento/Sales/Model/AbstractModel.php | 2 +- .../Magento/Sales/Model/AdminOrder/Create.php | 24 +- .../Magento/Sales/Model/Config/Ordered.php | 4 +- .../Magento/Sales/Model/Convert/Quote.php | 12 +- app/code/Magento/Sales/Model/Observer.php | 14 +- .../Model/Observer/Backend/CustomerQuote.php | 8 +- .../Frontend/Quote/Address/VatValidator.php | 4 +- app/code/Magento/Sales/Model/Order.php | 96 +- .../Magento/Sales/Model/Order/Creditmemo.php | 84 +- .../Sales/Model/Order/Creditmemo/Comment.php | 8 +- .../Model/Order/Creditmemo/Total/Shipping.php | 6 +- .../Magento/Sales/Model/Order/Invoice.php | 78 +- .../Sales/Model/Order/Invoice/Comment.php | 8 +- .../Sales/Model/Order/Invoice/Total/Tax.php | 2 +- .../Magento/Sales/Model/Order/Payment.php | 12 +- .../Sales/Model/Order/Payment/Transaction.php | 11 +- .../Sales/Model/Order/Pdf/AbstractPdf.php | 25 +- .../Sales/Model/Order/Pdf/Creditmemo.php | 27 +- .../Magento/Sales/Model/Order/Pdf/Invoice.php | 15 +- .../Sales/Model/Order/Pdf/Shipment.php | 15 +- .../Magento/Sales/Model/Order/Shipment.php | 78 +- .../Sales/Model/Order/Shipment/Comment.php | 8 +- .../Sales/Model/Order/Shipment/Track.php | 8 +- app/code/Magento/Sales/Model/Order/Status.php | 8 +- .../Sales/Model/Order/Status/History.php | 8 +- app/code/Magento/Sales/Model/Quote.php | 48 +- .../Magento/Sales/Model/Quote/Address.php | 94 +- .../Model/Quote/Address/RateResult/Method.php | 6 +- .../Model/Quote/Address/Total/Collector.php | 18 +- .../Model/Quote/Address/Total/Discount.php | 6 +- .../Sales/Model/Quote/Address/Total/Tax.php | 14 +- .../Sales/Model/Quote/Item/AbstractItem.php | 2 +- .../Resource/Order/Customer/Collection.php | 2 +- .../Resource/Order/Payment/Transaction.php | 2 +- .../Model/Resource/Report/Bestsellers.php | 4 +- .../Report/Bestsellers/Collection.php | 4 +- .../Sales/Model/Resource/Report/Invoiced.php | 9 +- .../Model/Resource/Report/Order/Createdat.php | 3 +- .../Sales/Model/Resource/Report/Shipping.php | 8 +- .../Sales/Model/Resource/Sale/Collection.php | 8 +- .../Magento/Sales/Model/Resource/Setup.php | 10 +- .../Magento/Sales/Model/Service/Quote.php | 149 +- app/code/Magento/Sales/etc/module.xml | 2 +- .../Sales/sql/sales_setup/install-1.6.0.0.php | 88 +- .../adminhtml/order/create/abstract.phtml | 1 + .../view/adminhtml/order/create/data.phtml | 4 +- .../order/creditmemo/create/form.phtml | 5 +- .../order/creditmemo/view/form.phtml | 1 + .../adminhtml/order/invoice/create/form.phtml | 1 + .../adminhtml/order/invoice/view/form.phtml | 1 + .../view/adminhtml/order/view/tab/info.phtml | 1 + .../Adminhtml/Promo/Quote/Edit/Tab/Main.php | 39 +- app/code/Magento/SalesRule/Helper/Coupon.php | 20 +- .../Plugin/QuoteConfigProductAttributes.php | 25 +- .../SalesRule/Model/Quote/Discount.php | 6 +- .../Magento/SalesRule/Model/Resource/Rule.php | 8 +- app/code/Magento/SalesRule/Model/Rule.php | 39 +- .../data-upgrade-1.6.0.3-1.6.0.4.php | 12 +- app/code/Magento/SalesRule/etc/di.xml | 6 +- app/code/Magento/SalesRule/etc/module.xml | 1 + .../sql/salesrule_setup/install-1.6.0.0.php | 18 +- .../upgrade-1.6.0.0-1.6.0.1.php | 2 +- .../upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../upgrade-1.6.0.2-1.6.0.3.php | 4 +- .../Magento/Sendfriend/Controller/Product.php | 4 +- app/code/Magento/Sendfriend/Helper/Data.php | 22 +- .../Magento/Sendfriend/Model/Sendfriend.php | 6 +- app/code/Magento/Sendfriend/etc/module.xml | 1 + .../sql/sendfriend_setup/install-1.6.0.0.php | 2 +- .../Block/Adminhtml/Order/Packaging.php | 39 +- .../Block/Adminhtml/Order/Packaging/Grid.php | 3 +- .../Magento/Shipping/Block/Tracking/Popup.php | 12 +- .../Controller/Adminhtml/Order/Shipment.php | 8 +- app/code/Magento/Shipping/Helper/Carrier.php | 21 +- app/code/Magento/Shipping/Helper/Data.php | 16 +- .../Model/Carrier/AbstractCarrier.php | 30 +- .../Model/Carrier/AbstractCarrierOnline.php | 6 +- .../Model/Carrier/Source/GenericDefault.php | 41 + .../Magento/Shipping/Model/CarrierFactory.php | 31 +- app/code/Magento/Shipping/Model/Config.php | 16 +- .../Model/Config/Source/Allmethods.php | 15 +- .../Shipping/Model/Order/Pdf/Packaging.php | 12 +- .../Magento/Shipping/Model/Order/Track.php | 4 +- .../Magento/Shipping/Model/Rate/Result.php | 6 +- app/code/Magento/Shipping/Model/Shipping.php | 52 +- .../Shipping/Model/Shipping/Labels.php | 75 +- app/code/Magento/Shipping/etc/di.xml | 1 + app/code/Magento/Shipping/etc/module.xml | 4 +- .../adminhtml/order/packaging/popup.phtml | 2 +- .../Sitemap/Block/Adminhtml/Edit/Form.php | 6 +- app/code/Magento/Sitemap/Helper/Data.php | 70 +- .../Sitemap/Model/Config/Backend/Priority.php | 2 +- app/code/Magento/Sitemap/Model/Observer.php | 46 +- .../Model/Resource/Catalog/Category.php | 10 +- .../Model/Resource/Catalog/Product.php | 12 +- app/code/Magento/Sitemap/Model/Sitemap.php | 6 +- app/code/Magento/Sitemap/etc/module.xml | 1 + .../sql/sitemap_setup/install-1.6.0.0.php | 6 +- .../App/Action/Plugin/StoreCheck.php | 8 +- .../Plugin/DispatchExceptionHandler.php | 8 +- .../Plugin/RequestPreprocessor.php | 28 +- .../App/Request/PathInfoProcessor.php | 8 +- .../{Core => Store}/App/Response/Redirect.php | 8 +- .../{Core => Store}/Block/Store/Switcher.php | 24 +- .../{Core => Store}/Block/Switcher.php | 35 +- .../Magento/{Core => Store}/Helper/Cookie.php | 40 +- .../Model/Config}/Converter.php | 14 +- .../Model/Config}/Processor/Placeholder.php | 34 +- .../Model/Config}/Reader/DefaultReader.php | 12 +- .../Model/Config/Reader}/ReaderPool.php | 18 +- .../Model/Config}/Reader/Store.php | 54 +- .../Model/Config}/Reader/Website.php | 18 +- .../Data.php => Store/Model/Exception.php} | 8 +- .../Model/Store => Store/Model}/Group.php | 55 +- .../Store => Store/Model}/Group/Factory.php | 6 +- .../Model/Resolver/Store.php} | 14 +- .../Model/Resolver/Website.php} | 34 +- .../Resource/Config}/Collection/Scoped.php | 2 +- .../Store => Store/Model/Resource}/Group.php | 22 +- .../Model/Resource}/Group/Collection.php | 10 +- .../{Core => Store}/Model/Resource/Store.php | 24 +- .../Model/Resource/Store/Collection.php | 16 +- .../Model/Resource/Website.php | 20 +- .../Model/Resource/Website/Collection.php | 14 +- .../Resource/Website/Grid/Collection.php | 10 +- .../{Core => Store}/Model/ScopeInterface.php | 6 +- .../Store => Store/Model}/Storage/Db.php | 151 +- .../Model}/Storage/DefaultStorage.php | 78 +- .../Magento/Store/Model/StorageFactory.php | 359 + .../Magento/{Core => Store}/Model/Store.php | 195 +- .../{Core => Store}/Model/StoreManager.php | 49 +- .../Model/StoreManagerInterface.php} | 40 +- app/code/Magento/Store/Model/StoresConfig.php | 72 + .../{Core => Store}/Model/System/Store.php | 28 +- .../Magento/{Core => Store}/Model/Website.php | 90 +- .../{Core => Store}/Model/Website/Factory.php | 8 +- app/code/Magento/Store/etc/di.xml | 166 + .../adminhtml => Store/etc/frontend}/di.xml | 6 +- .../Magento/{Rating => Store}/etc/module.xml | 8 +- .../Store/sql/store_setup/install-2.0.0.0.php | 292 + .../view/frontend/switch/flags.phtml | 2 - .../view/frontend/switch/languages.phtml | 1 - .../view/frontend/switch/stores.phtml | 3 +- .../Magento/Tax/Block/Adminhtml/Rate/Form.php | 15 +- .../Tax/Block/Adminhtml/Rate/Title.php | 6 +- .../Tax/Block/Adminhtml/Rate/Toolbar/Add.php | 4 +- .../Tax/Block/Adminhtml/Rate/Toolbar/Save.php | 86 +- .../Magento/Tax/Block/Sales/Order/Tax.php | 2 +- .../Magento/Tax/Controller/Adminhtml/Rate.php | 2 +- app/code/Magento/Tax/Helper/Data.php | 40 +- app/code/Magento/Tax/Model/Calculation.php | 53 +- app/code/Magento/Tax/Model/Config.php | 165 +- .../Tax/Model/Config/Price/IncludePrice.php | 2 +- .../Tax/Model/Rate/CsvImportHandler.php | 6 +- .../Tax/Model/Resource/Calculation.php | 6 +- .../Resource/Calculation/Rate/Collection.php | 8 +- .../Model/Resource/Report/Tax/Createdat.php | 2 +- app/code/Magento/Tax/Model/Resource/Setup.php | 6 +- .../Model/Sales/Total/Quote/Nominal/Tax.php | 2 +- .../Tax/Model/Sales/Total/Quote/Subtotal.php | 2 +- .../Tax/Model/Sales/Total/Quote/Tax.php | 2 +- .../Tax/Model/TaxClass/Type/Customer.php | 6 +- app/code/Magento/Tax/etc/module.xml | 1 + .../Tax/sql/tax_setup/install-1.6.0.0.php | 8 +- .../Tax/view/adminhtml/toolbar/rate/add.phtml | 1 - .../view/adminhtml/toolbar/rate/save.phtml | 6 - app/code/Magento/Theme/Block/Html.php | 20 +- app/code/Magento/Theme/Block/Html/Footer.php | 9 +- app/code/Magento/Theme/Block/Html/Head.php | 55 +- app/code/Magento/Theme/Block/Html/Header.php | 18 +- app/code/Magento/Theme/Block/Html/Notices.php | 15 +- app/code/Magento/Theme/Block/Html/Pager.php | 10 +- app/code/Magento/Theme/Model/Config.php | 10 +- .../Theme/Model/Config/Customization.php | 14 +- app/code/Magento/Theme/etc/module.xml | 2 + .../Theme/view/frontend/html/notices.phtml | 8 +- .../view/frontend/js/msg-box.js | 66 +- .../Theme/view/frontend/layout/default.xml | 14 +- .../frontend/layout/default_head_blocks.xml | 7 +- .../Translation/Model/Inline/Config.php | 23 +- .../Translation/Model/Inline/Parser.php | 22 +- .../Translation/Model/Resource/String.php | 28 +- .../Translation/Model/Resource/Translate.php | 8 +- .../data-upgrade-1.0.0.0-1.0.0.1.php | 2 +- app/code/Magento/Translation/etc/module.xml | 1 + .../sql/translation_setup/install-1.0.0.0.php | 6 +- .../Block/Backend/System/CarrierConfig.php | 10 +- app/code/Magento/Ups/Model/Carrier.php | 38 +- app/code/Magento/Ups/etc/module.xml | 1 + .../system/shipping/carrier_config.phtml | 2 +- .../UrlRewrite/App/Request/RewriteService.php | 6 +- .../UrlRewrite/Model/Resource/UrlRewrite.php | 8 +- .../Model/Resource/UrlRewrite/Collection.php | 6 +- .../Magento/UrlRewrite/Model/UrlRewrite.php | 34 +- app/code/Magento/UrlRewrite/etc/module.xml | 1 + .../sql/urlrewrite_setup/install-1.0.0.0.php | 4 +- app/code/Magento/User/Block/Buttons.php | 42 +- .../Magento/User/Model/Resource/Setup.php | 8 +- app/code/Magento/User/Model/User.php | 8 +- .../data-upgrade-1.6.1.1-1.6.1.2.php | 6 +- .../data-upgrade-1.6.1.3-1.6.1.4.php | 2 +- .../data-upgrade-1.6.1.4-1.6.1.5.php | 2 +- app/code/Magento/User/etc/di.xml | 1 - app/code/Magento/User/etc/module.xml | 4 +- .../User/sql/user_setup/install-1.6.0.0.php | 2 +- .../user_setup/upgrade-1.6.0.0-1.6.1.0.php | 2 +- .../user_setup/upgrade-1.6.1.0-1.6.1.1.php | 2 +- .../user_setup/upgrade-1.6.1.2-1.6.1.3.php | 2 +- .../user_setup/upgrade-1.6.1.3-1.6.1.4.php | 2 +- .../user_setup/upgrade-1.6.1.4-1.6.1.5.php | 2 +- .../user_setup/upgrade-1.6.1.5-1.6.1.6.php | 2 +- .../view/adminhtml/admin/forgotpassword.phtml | 5 +- .../admin/resetforgottenpassword.phtml | 5 +- .../User/view/adminhtml/role/info.phtml | 6 - app/code/Magento/Usps/Model/Carrier.php | 71 +- app/code/Magento/Usps/etc/adminhtml/di.xml | 7 - app/code/Magento/Usps/etc/module.xml | 1 + .../Webapi/Controller/ErrorProcessor.php | 15 +- app/code/Magento/Webapi/Controller/Rest.php | 40 +- .../Webapi/Controller/Rest/Request.php | 2 +- .../Webapi/Controller/Rest/Response.php | 8 +- .../Controller/ServiceArgsSerializer.php | 41 +- app/code/Magento/Webapi/Controller/Soap.php | 10 +- .../Controller/Soap/Request/Handler.php | 100 +- app/code/Magento/Webapi/Exception.php | 22 +- app/code/Magento/Webapi/Helper/Data.php | 32 +- .../Config/ClassReflector/TypeProcessor.php | 72 +- .../Magento/Webapi/Model/Plugin/Setup.php | 2 +- app/code/Magento/Webapi/Model/Soap/Fault.php | 150 +- app/code/Magento/Webapi/Model/Soap/Server.php | 26 +- .../Model/Soap/Wsdl/ComplexTypeStrategy.php | 3 + .../Webapi/Model/Soap/Wsdl/Generator.php | 86 +- .../ServiceAuthorizationException.php} | 4 +- .../ServiceException.php} | 4 +- .../ServiceResourceNotFoundException.php} | 4 +- app/code/Magento/Webapi/etc/module.xml | 4 +- .../sql/webapi_setup/install-1.0.0.0.php | 2 +- .../webapi_setup/upgrade-1.0.0.0-1.0.0.1.php | 2 +- .../webapi_setup/upgrade-1.0.0.1-1.0.0.2.php | 2 +- .../webapi_setup/upgrade-1.0.0.2-1.0.0.3.php | 2 +- .../webapi_setup/upgrade-1.0.0.3-1.0.0.4.php | 2 +- .../Magento/Weee/Block/Element/Weee/Tax.php | 3 +- app/code/Magento/Weee/Helper/Data.php | 79 +- .../Weee/Model/Attribute/Backend/Weee/Tax.php | 10 +- app/code/Magento/Weee/Model/Observer.php | 28 +- .../Resource/Attribute/Backend/Weee/Tax.php | 6 +- app/code/Magento/Weee/Model/Tax.php | 18 +- .../Magento/Weee/Model/Total/Quote/Weee.php | 4 +- app/code/Magento/Weee/etc/di.xml | 2 +- app/code/Magento/Weee/etc/module.xml | 1 + .../Weee/sql/weee_setup/install-1.6.0.0.php | 8 +- .../Widget/Instance/Edit/Tab/Main.php | 6 +- .../Magento/Widget/Model/Template/Filter.php | 10 +- .../data-upgrade-1.6.0.0-1.6.0.1.php | 8 +- app/code/Magento/Widget/etc/di.xml | 7 - app/code/Magento/Widget/etc/module.xml | 1 + .../sql/widget_setup/install-1.6.0.0.php | 2 +- .../widget_setup/upgrade-1.6.0.1-1.6.0.2.php | 2 +- .../Magento/Wishlist/Block/Share/Wishlist.php | 16 +- .../Controller/AbstractController.php | 16 +- .../Magento/Wishlist/Controller/Index.php | 68 +- .../Magento/Wishlist/Controller/Shared.php | 6 +- app/code/Magento/Wishlist/Helper/Data.php | 92 +- app/code/Magento/Wishlist/Model/Config.php | 18 +- app/code/Magento/Wishlist/Model/Item.php | 6 +- .../Model/Resource/Item/Collection.php | 8 +- .../Model/Resource/Item/Collection/Grid.php | 8 +- .../Model/Resource/Wishlist/Collection.php | 11 - app/code/Magento/Wishlist/Model/Wishlist.php | 12 +- app/code/Magento/Wishlist/etc/module.xml | 1 + .../sql/wishlist_setup/install-1.6.0.0.php | 6 +- .../view/email/share_notification.html | 6 +- .../css/source/module.less | 121 + .../Magento_Backend/css/source/module.less | 503 + .../images/logo-magento-small.png | Bin .../Magento_Backend/images/logo-magento.png | Bin .../Magento_Backend/layout/default.xml | 14 +- .../css/source/module.less | 98 + .../Magento_Theme/css/source/module.less | 227 + .../adminhtml/Magento/backend/css/admin.css | 4119 +++++ .../backend}/css/header.css | 0 .../backend}/css/pages.css | 201 +- .../backend/css/source/abstract.less} | 27 +- .../Magento/backend/css/source/dashboard.less | 205 + .../backend/css/source/navigation.less | 216 + .../Magento/backend/css/source/theme.less | 359 + .../adminhtml/Magento/backend/css/styles.less | 42 + .../calluna/CallunaSansBlack-webfont.eot | Bin .../calluna/CallunaSansBlack-webfont.svg | 0 .../calluna/CallunaSansBlack-webfont.ttf | Bin .../calluna/CallunaSansBlack-webfont.woff | Bin .../fonts/calluna/CallunaSansBold-webfont.eot | Bin .../fonts/calluna/CallunaSansBold-webfont.svg | 0 .../fonts/calluna/CallunaSansBold-webfont.ttf | Bin .../calluna/CallunaSansBold-webfont.woff | Bin .../calluna/CallunaSansLight-webfont.eot | Bin .../calluna/CallunaSansLight-webfont.svg | 0 .../calluna/CallunaSansLight-webfont.ttf | Bin .../calluna/CallunaSansLight-webfont.woff | Bin .../calluna/CallunaSansRegular-webfont.eot | Bin .../calluna/CallunaSansRegular-webfont.svg | 0 .../calluna/CallunaSansRegular-webfont.ttf | Bin .../calluna/CallunaSansRegular-webfont.woff | Bin .../calluna/CallunaSansSemiBold-webfont.eot | Bin .../calluna/CallunaSansSemiBold-webfont.svg | 0 .../calluna/CallunaSansSemiBold-webfont.ttf | Bin .../calluna/CallunaSansSemiBold-webfont.woff | Bin .../backend}/fonts/icons/admin-icons.eot | Bin .../backend}/fonts/icons/admin-icons.svg | 0 .../backend}/fonts/icons/admin-icons.ttf | Bin .../backend}/fonts/icons/admin-icons.woff | Bin .../backend}/i18n/en_US.csv | 0 .../backend}/images/ajax-loader-tr.gif | Bin .../backend}/images/ajax-loader.gif | Bin .../backend}/images/body-bg.jpg | Bin .../backend}/images/cancel_icon.gif | Bin .../backend}/images/edit_icon.gif | Bin .../images/fam_application_form_delete.png | Bin .../backend}/images/fam_bin.gif | Bin .../backend}/images/fam_bullet_disk.gif | Bin .../backend}/images/fam_leaf.png | Bin .../backend}/images/fam_link.gif | Bin .../backend}/images/fam_package_go.gif | Bin .../backend}/images/fam_refresh.gif | Bin .../backend}/images/grid-cal.gif | Bin .../backend}/images/grouped_to_order_icon.png | Bin .../backend}/images/ico_success.gif | Bin .../backend}/images/pager_arrow_left_off.gif | Bin .../backend}/images/pager_arrow_right_off.gif | Bin .../backend}/images/process_spinner.gif | Bin .../backend}/images/rule_chooser_trigger.gif | Bin .../backend}/images/rule_component_add.gif | Bin .../backend}/images/rule_component_apply.gif | Bin .../backend}/images/rule_component_remove.gif | Bin .../Magento/backend/images/select-bg.svg | 9 + .../backend}/images/subconfig-bg.png | Bin .../backend}/images/switcher.png | Bin .../backend}/js/theme.js | 60 +- .../backend}/less/clearless/all.less | 36 +- .../backend}/less/clearless/arrows.less | 310 +- .../backend}/less/clearless/grids.less | 338 +- .../backend}/less/clearless/helpers.less | 462 +- .../backend}/less/clearless/icons.less | 620 +- .../backend}/less/clearless/resets.less | 578 +- .../backend}/less/clearless/settings.less | 66 +- .../backend}/less/clearless/sprites.less | 116 +- .../backend}/less/clearless/typography.less | 96 +- .../backend}/less/lib/buttons.less | 356 +- .../backend}/less/styles/admin.less | 1560 +- .../backend}/less/styles/base.less | 203 +- .../backend}/less/styles/debug.less | 0 .../backend}/less/styles/header.less | 2 +- .../backend}/less/styles/pages.less | 291 +- .../backend}/less/styles/vars.less | 15 +- .../backend}/less/vars.less | 140 +- .../backend}/mui/base.css | 59 - .../backend}/mui/components.css | 4 +- .../backend}/mui/elements.css | 4 +- .../backend}/mui/fonts/MUI-Icons.eot | Bin .../backend}/mui/fonts/MUI-Icons.svg | 0 .../backend}/mui/fonts/MUI-Icons.ttf | Bin .../backend}/mui/fonts/MUI-Icons.woff | Bin .../backend}/mui/form.css | 0 .../backend}/mui/grid.css | 0 .../backend}/mui/icons.css | 0 .../backend}/mui/images/ajax-loader-big.gif | Bin .../backend}/mui/images/ajax-loader-small.gif | Bin .../backend}/mui/images/ajax-loader-white.gif | Bin .../backend}/mui/images/ajax-loader.gif | Bin .../backend}/mui/images/ajax-loader.svg | 0 .../mui/images/pagination-arrows-bg.png | Bin .../backend}/mui/images/rating-bg.png | Bin .../backend}/mui/images/sorter-bg.png | Bin .../backend}/mui/images/view-mode-bg.png | Bin .../backend}/mui/print.css | 0 .../backend}/mui/reset.css | 0 .../backend}/mui/utils.css | 0 .../backend}/theme.xml | 2 +- .../adminhtml/magento_backend/css/admin.css | 6629 ------- .../magento_backend/css/styles-ie8.css | 300 - .../images/icons-dashboard-switcher.png | Bin 1163 -> 0 bytes .../less/styles/styles-ie8.less | 372 - .../Magento_Bundle/css/source/module.less | 0 .../Magento_Catalog/css/source/module.less | 0 .../Magento_Catalog/css/source/widgets.less | 0 .../layout/catalog_product_view.xml | 2 +- .../css/source/module.less | 0 .../Magento_Checkout/css/source/module.less | 0 .../layout/checkout_cart_index.xml | 2 +- .../Magento_Cms/css/source/widgets.less | 0 .../Magento_Customer/css/source/module.less | 0 .../css/source/module.less | 0 .../Magento_Newsletter/css/source/module.less | 0 .../Magento_Paypal}/css/source/module.less | 0 .../Magento_Reports/css/source/widgets.less | 0 .../Magento_Review/css/source/module.less | 0 .../Magento_Sales/css/source/module.less | 0 .../Magento_Sales/css/source/widgets.less | 0 .../Magento_Sendfriend/css/source/module.less | 0 .../Magento_Theme/css/source/module.less | 0 .../blank}/Magento_Theme/layout/default.xml | 2 +- .../layout/default_head_blocks.xml | 3 +- .../Magento_Wishlist/css/source/module.less | 0 .../blank}/css/print.less | 2 +- .../blank}/css/source/abstract.less | 0 .../blank}/css/source/actions-toolbar.less | 0 .../blank}/css/source/breadcrumbs.less | 0 .../blank}/css/source/buttons.less | 0 .../blank}/css/source/dropdowns.less | 0 .../blank}/css/source/forms.less | 0 .../blank}/css/source/icons.less | 0 .../blank}/css/source/layout.less | 0 .../blank}/css/source/loaders.less | 0 .../blank}/css/source/messages.less | 0 .../blank}/css/source/navigation.less | 0 .../blank}/css/source/pages.less | 0 .../blank}/css/source/popups.less | 0 .../blank}/css/source/rating.less | 0 .../blank}/css/source/sections.less | 0 .../blank}/css/source/tables.less | 0 .../blank}/css/source/theme.less | 0 .../blank}/css/source/tooltips.less | 0 .../blank}/css/source/typography.less | 0 .../blank}/css/styles.less | 2 +- .../fonts/opensans/bold/opensans-700.eot | Bin .../fonts/opensans/bold/opensans-700.svg | 0 .../fonts/opensans/bold/opensans-700.ttf | Bin .../fonts/opensans/bold/opensans-700.woff | Bin .../fonts/opensans/light/opensans-300.eot | Bin .../fonts/opensans/light/opensans-300.svg | 0 .../fonts/opensans/light/opensans-300.ttf | Bin .../fonts/opensans/light/opensans-300.woff | Bin .../fonts/opensans/regular/opensans-400.eot | Bin .../fonts/opensans/regular/opensans-400.svg | 0 .../fonts/opensans/regular/opensans-400.ttf | Bin .../fonts/opensans/regular/opensans-400.woff | Bin .../fonts/opensans/semibold/opensans-600.eot | Bin .../fonts/opensans/semibold/opensans-600.svg | 0 .../fonts/opensans/semibold/opensans-600.ttf | Bin .../fonts/opensans/semibold/opensans-600.woff | Bin .../blank}/images/logo.gif | Bin .../blank}/js/navigation-menu.js | 0 .../blank}/js/responsive.js | 0 .../blank}/js/theme.js | 0 .../blank}/media/preview.jpg | Bin .../blank}/theme.xml | 2 +- .../{magento_blank => Magento/blank}/view.xml | 2 +- .../layout/catalog_category_view.xml | 2 +- .../layout/catalog_product_view.xml | 2 +- .../Magento_Catalog/layout/default.xml | 2 +- .../layout/checkout_cart_index.xml | 2 +- .../Magento_Customer/layout/default.xml | 2 +- .../controls/image_sizing.xml | 2 +- .../controls/quick_styles.xml | 2 +- .../layout/catalog_product_view.xml | 2 +- .../layout/catalog_product_view.xml | 2 +- .../layout/review_product_list.xml | 2 +- .../plushe}/Magento_Theme/layout/default.xml | 2 +- .../layout/default_head_blocks.xml | 2 +- .../plushe}/css/print.css | 0 .../plushe}/css/source/clearless/all.less | 0 .../plushe}/css/source/clearless/arrows.less | 0 .../plushe}/css/source/clearless/grids.less | 0 .../plushe}/css/source/clearless/helpers.less | 0 .../plushe}/css/source/clearless/icons.less | 0 .../plushe}/css/source/clearless/resets.less | 0 .../css/source/clearless/settings.less | 0 .../plushe}/css/source/clearless/sprites.less | 0 .../css/source/clearless/typography.less | 0 .../plushe}/css/source/lib/buttons.less | 0 .../plushe}/css/source/lib/forms.less | 0 .../plushe}/css/source/lib/grids.less | 0 .../plushe}/css/source/lib/icons.less | 0 .../plushe}/css/source/lib/messages.less | 0 .../plushe}/css/source/lib/navigation.less | 0 .../plushe}/css/source/lib/sections.less | 0 .../plushe}/css/source/lib/snippets.less | 0 .../css/source/responsive/responsive.less | 0 .../plushe}/css/source/styles/base.less | 0 .../plushe}/css/source/styles/magento.less | 0 .../plushe}/css/source/vars.less | 0 .../plushe}/css/styles.less | 0 .../plushe}/fonts/.htaccess | 0 .../plushe}/fonts/icons/icons.dev.svg | 0 .../plushe}/fonts/icons/icons.eot | Bin .../plushe}/fonts/icons/icons.svg | 0 .../plushe}/fonts/icons/icons.ttf | Bin .../plushe}/fonts/icons/icons.woff | Bin .../plushe}/fonts/marvel/OFL.txt | 0 .../marvel/marvel-400-normal-webfont.eot | Bin .../marvel/marvel-400-normal-webfont.svg | 0 .../marvel/marvel-400-normal-webfont.ttf | Bin .../marvel/marvel-400-normal-webfont.woff | Bin .../sourcesanspro-200-normal-webfont.eot | Bin .../sourcesanspro-200-normal-webfont.svg | 0 .../sourcesanspro-200-normal-webfont.ttf | Bin .../sourcesanspro-200-normal-webfont.woff | Bin .../sourcesanspro-400-normal-webfont.eot | Bin .../sourcesanspro-400-normal-webfont.svg | 0 .../sourcesanspro-400-normal-webfont.ttf | Bin .../sourcesanspro-400-normal-webfont.woff | Bin .../sourcesanspro-600-normal-webfont.eot | Bin .../sourcesanspro-600-normal-webfont.svg | 0 .../sourcesanspro-600-normal-webfont.ttf | Bin .../sourcesanspro-600-normal-webfont.woff | Bin .../sourcesanspro-700-normal-webfont.eot | Bin .../sourcesanspro-700-normal-webfont.svg | 0 .../sourcesanspro-700-normal-webfont.ttf | Bin .../sourcesanspro-700-normal-webfont.woff | Bin .../plushe}/i18n/en_US.csv | 0 .../plushe}/images/banner1.jpg | Bin .../plushe}/images/banner2.jpg | Bin .../plushe}/images/banner3.jpg | Bin .../plushe}/images/banner4.jpg | Bin .../plushe}/images/blog_bg.png | Bin .../images/express-checkout-retina.png | Bin .../plushe}/images/header-bg.jpg | Bin .../plushe}/images/info_photo.jpg | Bin .../plushe}/images/loader.gif | Bin .../plushe}/images/logo.gif | Bin .../plushe}/images/logo_notext.gif | Bin .../plushe}/images/main_image1.jpg | Bin .../plushe}/images/social-links.png | Bin .../plushe}/images/texture.png | Bin .../plushe}/js/jquery.dropdowns.js | 0 .../plushe}/js/navigation-menu.js | 0 .../plushe}/js/responsive.js | 0 .../plushe}/js/sticky.js | 0 .../plushe}/js/tabs.js | 0 .../plushe}/js/theme.js | 0 .../plushe}/mage/gallery.css | 0 .../plushe}/media/preview.jpg | Bin .../plushe}/theme.xml | 2 +- .../plushe}/view.xml | 2 +- .../basic}/css/boxes.css | 0 .../basic}/css/clears.css | 0 .../basic}/css/ie7minus.css | 0 .../basic}/css/iestyles.css | 0 .../basic}/css/reset.css | 0 .../basic}/images/error_msg_icon.gif | Bin .../basic}/images/footer_bg.gif | Bin .../basic}/images/footer_container_bg.gif | Bin .../basic}/images/footer_info_separator.gif | Bin .../basic}/images/footer_informational_bg.gif | Bin .../basic}/images/footer_left.gif | Bin .../basic}/images/footer_legality_bg.gif | Bin .../basic}/images/footer_right.gif | Bin .../basic}/images/header_bg.gif | Bin .../basic}/images/header_nav_bg.gif | Bin .../basic}/images/header_top_bg.jpg | Bin .../basic}/images/header_top_container_bg.jpg | Bin .../basic}/images/i_notice.gif | Bin .../basic}/images/main_bg.gif | Bin .../basic}/images/main_container_bg.gif | Bin .../basic}/images/note_msg_icon.gif | Bin .../basic}/images/success_msg_icon.gif | Bin .../basic}/images/validation_advice_bg.gif | Bin .../basic}/theme.xml | 2 +- app/etc/di.xml | 38 +- dev/shell/indexer.php | 2 +- dev/shell/install.php | 2 +- dev/shell/log.php | 2 +- dev/shell/newindexer.php | 2 +- .../Annotation/ConfigFixture.php | 43 +- .../Magento/TestFramework/Helper/Eav.php | 2 +- .../TestFramework/Listener/ExtededTestdox.php | 307 + .../Magento/TestFramework/ObjectManager.php | 6 +- .../Magento/TestFramework/View/Layout.php | 2 +- dev/tests/integration/framework/bootstrap.php | 2 +- dev/tests/integration/phpunit.xml.dist | 2 +- .../{Core/Model => App}/Config/BaseTest.php | 8 +- .../{Core/Model => App}/Config/DataTest.php | 12 +- .../Model => App}/Config/ElementTest.php | 8 +- .../FrontController/Plugin/InstallTest.php | 4 +- .../Authz/Service/AuthorizationV1Test.php | 2 +- .../Block/System/Account/Edit/FormTest.php | 2 +- .../Backend/Block/System/Config/FormTest.php | 4 +- .../System/Design/Edit/Tab/GeneralTest.php | 2 +- .../Backend/Block/System/Store/DeleteTest.php | 2 +- .../System/Store/Edit/Form/GroupTest.php | 4 +- .../System/Store/Edit/Form/StoreTest.php | 4 +- .../System/Store/Edit/Form/WebsiteTest.php | 4 +- .../Backend/Block/System/Store/EditTest.php | 30 +- .../Magento/Backend/Block/TemplateTest.php | 27 +- .../Urlrewrite/Catalog/Category/EditTest.php | 2 +- .../Urlrewrite/Catalog/Edit/FormTest.php | 8 +- .../Urlrewrite/Catalog/Product/EditTest.php | 2 +- .../Urlrewrite/Cms/Page/Edit/FormTest.php | 4 +- .../Block/Urlrewrite/Cms/Page/EditTest.php | 2 +- .../Block/Urlrewrite/Edit/FormTest.php | 6 +- .../Backend/Block/Urlrewrite/EditTest.php | 2 +- .../Backend/Block/Widget/ContainerTest.php | 11 +- .../Block/Widget/Form/ContainerTest.php | 2 +- .../Magento/Backend/Block/Widget/FormTest.php | 2 +- .../Block/Widget/Grid/ColumnSetTest.php | 2 +- .../Backend/Block/Widget/Grid/ItemTest.php | 2 +- .../Block/Widget/Grid/MassactionTest.php | 2 +- .../Magento/Backend/Block/Widget/GridTest.php | 4 +- .../Magento/Backend/Block/Widget/TabsTest.php | 2 +- .../Magento/Backend/Block/WidgetTest.php | 4 +- .../Model/Config/Backend/BaseurlTest.php | 149 +- .../Tab/Bundle/Option/Search/GridTest.php | 2 +- .../Edit/Tab/Bundle/Option/SearchTest.php | 2 +- .../Magento/Captcha/Model/ObserverTest.php | 2 +- .../Product/Attribute/Set/Toolbar/AddTest.php | 2 +- .../Edit/Tab/Options/Type/SelectTest.php | 4 +- .../Block/Adminhtml/Product/Edit/TabsTest.php | 2 +- .../Product/Helper/Form/CategoryTest.php | 2 +- .../Helper/Form/Gallery/ContentTest.php | 2 +- .../Magento/Catalog/Block/Product/NewTest.php | 25 +- .../Block/Product/ProductList/ToolbarTest.php | 2 +- .../Block/Product/View/AdditionalTest.php | 2 +- .../Catalog/Block/Product/ViewTest.php | 2 +- .../Controller/Adminhtml/CategoryTest.php | 12 +- .../Adminhtml/Product/AttributeTest.php | 2 +- .../Magento/Catalog/Helper/DataTest.php | 8 +- .../Magento/Catalog/Helper/ImageTest.php | 4 +- .../Magento/Catalog/Model/AbstractTest.php | 4 +- .../Model/Category/CategoryImageTest.php | 22 +- .../StubZendLogWriterStreamTest.php | 15 +- .../Magento/Catalog/Model/CategoryTest.php | 14 +- .../Indexer/Product/Flat/ProcessorTest.php | 6 +- .../Catalog/Model/Layer/CategoryTest.php | 83 +- .../Product/Attribute/Backend/PriceTest.php | 2 +- .../Attribute/Backend/TierpriceTest.php | 6 +- .../Catalog/Model/ProductExternalTest.php | 2 +- .../Catalog/Model/ProductGettersTest.php | 17 - .../Magento/Catalog/Model/ProductTest.php | 44 +- .../Magento/Catalog/_files/categories.php | 2 +- .../Magento/Catalog/_files/products.php | 2 +- .../Catalog/controllers/_files/products.php | 4 +- .../Form/Field/CustomergroupTest.php | 53 + .../Promo/Catalog/Edit/Tab/MainTest.php | 7 +- .../CatalogSearch/Block/ResultTest.php | 2 +- .../Magento/CatalogSearch/Helper/DataTest.php | 2 +- .../Magento/Centinel/CreateOrderTest.php | 2 +- .../Magento/Checkout/Block/CartTest.php | 6 +- .../Checkout/_files/discount_10percent.php | 2 +- .../Magento/Cms/Controller/RouterTest.php | 4 +- .../testsuite/Magento/Cms/Helper/PageTest.php | 2 +- .../Cms/Model/Wysiwyg/Images/StorageTest.php | 2 +- .../testsuite/Magento/Cms/_files/block.php | 2 +- .../testsuite/Magento/Cms/_files/pages.php | 2 +- .../Product/Edit/Tab/Super/SettingsTest.php | 2 +- .../Backend/Grid/ColumnSetTest.php | 2 +- .../Magento/Core/Model/App/AreaTest.php | 16 +- .../Model/Design/Backend/ExceptionsTest.php | 40 +- .../Magento/Core/Model/DesignTest.php | 60 +- .../Core/Model/Resource/HelperTest.php | 2 +- .../Core/Model/Resource/Layout/UpdateTest.php | 2 +- .../Session/AbstractSession/VarienTest.php | 85 - .../Magento/Core/Model/TemplateTest.php | 2 +- .../Magento/Core/Model/View/DesignTest.php | 14 +- .../Magento/Core/_files/design_change.php | 7 +- .../Core/_files/design_change_timezone.php | 2 +- .../Core/_files/second_third_store.php | 18 +- .../testsuite/Magento/Core/_files/store.php | 10 +- .../Customer/Block/Address/EditTest.php | 2 +- .../Block/Adminhtml/Edit/Tab/CartTest.php | 4 +- .../Block/Adminhtml/Edit/Tab/CartsTest.php | 2 +- .../Adminhtml/Edit/Tab/View/AccordionTest.php | 4 +- .../Block/Adminhtml/Edit/Tab/ViewTest.php | 7 +- .../Block/Adminhtml/Group/Edit/FormTest.php | 23 +- .../Block/Adminhtml/Group/EditTest.php | 17 +- .../Customer/Block/Adminhtml/OnlineTest.php | 2 +- .../Controller/Adminhtml/GroupTest.php | 68 +- .../Controller/Adminhtml/IndexTest.php | 8 +- .../Magento/Customer/Helper/DataTest.php | 76 - .../Customer/Model/Config/ShareTest.php | 4 +- .../Service/V1/CustomerAccountServiceTest.php | 571 +- .../Service/V1/CustomerGroupServiceTest.php | 133 +- .../Magento/Customer/_files/quote.php | 7 +- .../Magento/DB/Adapter/InterfaceTest.php | 4 +- .../Model/Resource => DB}/TransactionTest.php | 15 +- .../Model/Translate/InlineTest.php | 2 +- .../_files/design_editor_active.php | 2 +- .../Dhl/Block/Adminhtml/UnitofmeasureTest.php | 2 +- .../Edit/Tab/Downloadable/LinksTest.php | 2 +- .../Attribute/Edit/Main/AbstractTest.php | 2 +- .../Email/Model/Template/FilterTest.php | 32 +- .../Magento/Email/Model/TemplateTest.php | 61 +- .../Model/Export/AbstractStubEntity.php | 6 +- .../Model/Export/Entity/AbstractEavTest.php | 4 +- .../Entity/Eav/Customer/AddressTest.php | 20 +- .../Model/Export/Entity/Eav/CustomerTest.php | 2 +- .../Model/Export/EntityAbstractTest.php | 14 +- .../Model/Import/EntityAbstractTest.php | 2 +- .../Magento/Install/Block/AdminTest.php | 2 +- .../Magento/Install/Model/ConfigTest.php | 4 +- .../Magento/Install/Model/InstallerTest.php | 2 +- .../Magento/Log/Model/VisitorTest.php | 103 + .../testsuite/Magento/MemoryUsageTest.php | 4 +- .../Model/Resource/Db/AbstractTest.php | 6 +- .../Resource/Db/Collection/AbstractTest.php | 23 +- .../Magento/Model/Resource/IteratorTest.php | 14 +- .../testsuite/Magento/Model/ResourceTest.php | 2 +- .../Model/Resource => Module}/SetupTest.php | 32 +- .../Block/Checkout/AddressesTest.php | 88 + .../Block/Adminhtml/SubscriberTest.php | 2 +- .../Newsletter/Controller/ManageTest.php | 4 +- .../Magento/Newsletter/Model/TemplateTest.php | 16 +- .../Magento/Newsletter/_files/queue.php | 4 +- .../Magento/Newsletter/_files/subscribers.php | 12 +- .../Magento/Object/Copy/Config/ReaderTest.php | 4 +- .../ObjectManager/_files/config_merged.xml | 4 +- .../ObjectManager/_files/config_one.xml | 4 +- .../ObjectManager/_files/config_two.xml | 4 +- .../Model/System/Config/Backend/TtlTest.php | 4 +- .../System/Config/Backend/VarnishTest.php | 4 +- .../Magento/Payment/Block/InfoTest.php | 2 +- .../Magento/Payment/Model/ObserverTest.php | 34 +- .../Controller/Billing/AgreementTest.php | 140 + .../Magento/Paypal/Controller/ExpressTest.php | 61 + .../Paypal/Model/Express/CheckoutTest.php | 208 + .../Magento/Paypal/Model/VoidTest.php | 6 +- .../Paypal/_files/quote_payment_express.php | 89 +- .../quote_payment_express_with_customer.php | 107 + .../Paypal/_files/quote_payment_payflow.php | 13 +- .../Paypal/_files/quote_payment_standard.php | 13 +- .../Catalog/Product/View/PaymentTest.php | 2 +- .../Block/Adminhtml/Filter/FormTest.php | 2 +- .../Block/Adminhtml/Edit/Tab/FormTest.php | 6 +- .../Magento/Review/Controller/ProductTest.php | 2 +- .../Magento/Review/_files/customer_review.php | 4 +- .../Review/_files/different_reviews.php | 18 +- .../Magento/Review/_files/review_xss.php | 6 +- .../Magento/Review/_files/reviews.php | 6 +- .../Magento/Rss/Controller/CatalogTest.php | 33 +- .../Rule/Model/Condition/AbstractTest.php | 2 +- .../Block/Adminhtml/Items/AbstractTest.php | 2 +- .../Order/Create/Form/AbstractTest.php | 3 +- .../Block/Adminhtml/Order/Create/FormTest.php | 2 +- .../Magento/Sales/Block/Order/TotalsTest.php | 3 +- .../Magento/Sales/Model/Quote/AddressTest.php | 26 +- .../testsuite/Magento/Sales/_files/order.php | 2 +- .../Sales/_files/order_fixture_store.php | 2 +- .../Magento/Sales/_files/order_info.php | 18 +- .../_files/order_paid_with_payflowpro.php | 2 +- .../Sales/_files/order_paid_with_saved_cc.php | 7 +- .../testsuite/Magento/Sales/_files/quote.php | 2 +- .../Promo/Quote/Edit/Tab/MainTest.php | 10 +- .../_files/cart_rule_40_percent_off.php | 2 +- .../_files/cart_rule_50_percent_off.php | 2 +- .../{Core/Model => }/Session/ConfigTest.php | 12 +- .../Magento/Session/SessionManagerTest.php | 4 +- .../Model => }/Session/SidResolverTest.php | 35 +- .../Magento/Sitemap/Helper/DataTest.php | 49 +- .../Model/Resource/Catalog/ProductTest.php | 6 +- .../Model/Store => Store/Model}/GroupTest.php | 13 +- .../Model/Resource/Store/CollectionTest.php | 23 +- .../Model/Resource/StoreTest.php | 6 +- .../Model/Resource/WebsiteTest.php | 6 +- .../{Core => Store}/Model/StoreTest.php | 86 +- .../{Core => Store}/Model/WebsiteTest.php | 27 +- .../Tax/Model/TaxClass/Type/CustomerTest.php | 31 +- .../Integrity/Magento/Payment/MethodsTest.php | 27 +- .../Modular/BlockInstantiationTest.php | 35 +- .../Integrity/Modular/TemplateFilesTest.php | 40 +- .../Test/Integrity/Theme/ViewFilesTest.php | 29 - .../Test/Integrity/Theme/XmlFilesTest.php | 5 +- .../Magento/Theme/Block/Html/FooterTest.php | 2 +- .../Magento/Theme/Block/Html/HeadTest.php | 8 +- .../Magento/Theme/Block/HtmlTest.php | 41 +- .../Magento/Tools/View/GeneratorTest.php | 2 +- .../Magento/Translate/InlineTest.php | 18 +- .../testsuite/Magento/TranslateTest.php | 5 +- .../Translation/Model/InlineParserTest.php | 20 +- .../UrlRewrite/Model/UrlRewriteTest.php | 12 +- .../integration/testsuite/Magento/UrlTest.php | 4 +- .../View/Element/AbstractBlockTest.php | 6 +- .../Magento/View/Element/TemplateTest.php | 2 +- .../LayoutArgumentObjectUpdater.php | 2 +- .../LayoutArgumentSimpleUpdater.php | 2 +- .../Model => View}/LayoutDirectivesTest.php | 2 +- .../{Core/Model => View}/LayoutTest.php | 53 +- .../Magento/View/PublicationTest.php | 6 +- .../Magento/{Core => View}/Utility/Layout.php | 21 +- .../{Core => View}/Utility/LayoutTest.php | 15 +- .../Utility/_files/layout/handle_one.xml | 2 +- .../Utility/_files/layout/handle_three.xml | 2 +- .../Utility/_files/layout/handle_two.xml | 2 +- .../_files/layout_merged/multiple_handles.xml | 0 .../_files/layout_merged/single_handle.xml | 0 .../_files/layout/cacheable.xml | 2 +- .../_files/layout/container_attributes.xml | 2 +- .../_files/layout/non_cacheable.xml | 2 +- .../action_for_anonymous_parent_block.xml | 2 +- .../layout_directives_test/arguments.xml | 2 +- .../arguments_complex_values.xml | 2 +- .../arguments_object_type.xml | 2 +- .../arguments_object_type_updaters.xml | 12 +- .../arguments_url_type.xml | 2 +- .../layout_directives_test/get_block.xml | 2 +- .../get_block_exception.xml | 2 +- .../_files/layout_directives_test/group.xml | 2 +- .../layout_directives_test/ifconfig.xml | 2 +- .../_files/layout_directives_test/move.xml | 0 .../move_alias_broken.xml | 0 .../layout_directives_test/move_broken.xml | 0 .../layout_directives_test/move_new_alias.xml | 0 .../move_the_same_alias.xml | 0 .../_files/layout_directives_test/remove.xml | 0 .../layout_directives_test/remove_broken.xml | 2 +- .../_files/layout_directives_test/render.xml | 2 +- .../sort_after_after.xml | 2 +- .../sort_after_previous.xml | 2 +- .../sort_before_after.xml | 2 +- .../sort_before_before.xml | 2 +- .../Magento/Webapi/Model/Soap/ServerTest.php | 24 +- .../Magento/Weee/Model/ObserverTest.php | 14 +- .../testsuite/Magento/Weee/Model/TaxTest.php | 98 + .../Edit/Chooser/DesignAbstractionTest.php | 2 +- .../Widget/Instance/Edit/Tab/MainTest.php | 3 +- .../Widget/Model/Widget/ConfigTest.php | 2 +- .../Widget/Model/Widget/InstanceTest.php | 6 +- .../Magento/Widget/Model/WidgetTest.php | 8 +- .../Wishlist/Block/Share/WishlistTest.php | 62 + .../Magento/Wishlist/Controller/IndexTest.php | 96 + .../Magento/Wishlist/Helper/DataTest.php | 47 +- dev/tests/js/framework/qunit/qunit-1.14.0.css | 237 + dev/tests/js/framework/qunit/qunit-1.14.0.js | 2288 +++ dev/tests/js/jsTestDriver.php.dist | 2 +- dev/tests/js/jsTestDriverOrder.php | 4 +- dev/tests/js/testsuite/mage/_demo/index.html | 42 + .../testsuite/mage/_demo/test.js} | 9 +- .../mage/loader/jquery-loader-test.js | 110 + .../js/testsuite/mage/loader/loader.html | 57 + .../TestFramework/Helper/Categories.php | 2 +- dev/tests/performance/run_scenarios.php | 2 +- .../catalog_200_categories_80k_products.php | 4 +- .../catalog_category_flat_enabled.php | 2 +- .../fixtures/catalog_product_flat_enabled.php | 2 +- .../testsuite/fixtures/sales_100k_orders.php | 2 +- .../fixtures/shipping_flatrate_enabled.php | 2 +- .../Integrity/ConcreteImplementationTest.php | 71 - .../Test/Integrity/Di/CompilerTest.php | 2 +- .../Integrity/_files/classes/blacklist.txt | 23 - .../_files/dependency_test/tables_ce.php | 22 +- .../Test/Legacy/_files/obsolete_classes.php | 112 +- .../Legacy/_files/obsolete_config_nodes.php | 2 +- .../Test/Legacy/_files/obsolete_constants.php | 40 +- .../Test/Legacy/_files/obsolete_methods.php | 72 +- .../Legacy/_files/obsolete_properties.php | 27 +- .../Test/Php/_files/blacklist/common.txt | 4 +- .../Php/_files/phpcpd/blacklist/common.txt | 3 + .../Test/Php/_files/whitelist/common.txt | 3 +- .../Magento/Test/Block/Adminhtml.php | 16 +- .../Helper/ObjectManagerTest.php | 14 +- .../Model/System/Message/BaseurlTest.php | 32 +- .../Model/System/Message/SecurityTest.php | 14 +- .../Model => App}/Config/FileResolverTest.php | 6 +- .../Magento/App/Config/ScopePoolTest.php | 8 +- .../DirectoryList/ConfigurationTest.php | 2 +- .../unit/testsuite/Magento/App/HttpTest.php | 167 + .../Magento/App/PageCache/FormKeyTest.php | 4 +- .../Magento/App/ReinitableConfigTest.php | 2 +- .../Magento/App/Request/HttpTest.php | 95 + .../Magento/App/Resource/ConfigTest.php | 33 +- .../testsuite/Magento/App/ResourceTest.php | 202 + .../Magento/App/Response/HttpTest.php | 9 + .../App/Route/Config/SchemaLocatorTest.php | 49 + .../Magento/App/Route/ConfigTest.php | 30 + .../Magento/App/Router/DefaultRouterTest.php | 59 + .../Magento/App/ScopeResolverPoolTest.php | 75 + .../unit/testsuite/Magento/App/ViewTest.php | 12 +- .../Authorizenet/Helper/BackendTest.php | 2 +- .../Model/Directpost/ObserverTest.php | 4 +- .../Authz/Service/AuthorizationV1Test.php | 2 +- .../Area/Request/PathInfoProcessorTest.php | 2 +- .../Magento/Backend/App/ConfigTest.php | 6 - .../Page/System/Config/Robots/ResetTest.php | 24 +- .../Backend/Block/Store/SwitcherTest.php | 215 - .../Backend/Block/System/Config/EditTest.php | 2 +- .../Block/System/Config/Form/FieldTest.php | 2 +- .../Block/System/Config/Form/FieldsetTest.php | 2 +- .../Backend/Block/System/Config/FormTest.php | 20 +- .../Backend/Block/Widget/ButtonTest.php | 2 +- .../Widget/Grid/Column/MultistoreTest.php | 2 +- .../Grid/Column/Renderer/CurrencyTest.php | 2 +- .../Block/Widget/Grid/ColumnSetTest.php | 2 +- .../Backend/Block/Widget/Grid/ColumnTest.php | 2 +- .../Block/Widget/Grid/MassactionTest.php | 2 +- .../Magento/Backend/Block/Widget/GridTest.php | 12 +- .../Magento/Backend/Model/AuthTest.php | 2 +- .../Model/Config/Backend/BaseurlTest.php | 15 +- .../Model/Config/Backend/EncryptedTest.php | 2 +- .../Model/Config/Backend/SecureTest.php | 11 +- .../Backend/Model/Config/LoaderTest.php | 4 +- .../Backend/Model/Config/ScopeDefinerTest.php | 6 +- .../Config/Structure/AbstractElementTest.php | 20 +- .../Element/AbstractCompositeTest.php | 2 +- .../Element/Dependency/MapperTest.php | 39 +- .../Config/Structure/Element/FieldTest.php | 2 +- .../Config/Structure/Element/GroupTest.php | 2 +- .../Config/Structure/Element/SectionTest.php | 2 +- .../Config/Structure/Element/TabTest.php | 2 +- .../Magento/Backend/Model/ConfigTest.php | 133 +- .../Magento/Backend/Model/Menu/ConfigTest.php | 8 +- .../Backend/Model/Menu/Item/ValidatorTest.php | 2 +- .../Magento/Backend/Model/Menu/ItemTest.php | 8 +- .../Magento/Backend/Model/UrlTest.php | 36 +- .../Magento/Backend/Model/ViewTest.php | 2 +- .../Catalog/Product/View/Type/BundleTest.php | 2 +- .../Bundle/Model/Product/CatalogPriceTest.php | 4 +- .../Bundle/Model/Product/PriceTest.php | 132 + .../Captcha/Helper/Adminhtml/DataTest.php | 6 +- .../Magento/Captcha/Helper/DataTest.php | 60 +- .../Magento/Captcha/Model/CronTest.php | 8 +- .../Magento/Captcha/Model/DefaultTest.php | 6 +- .../Magento/Captcha/Model/ObserverTest.php | 2 +- .../Composite/Fieldset/OptionsTest.php | 2 +- .../Adminhtml/Product/Edit/Tab/AlertsTest.php | 22 +- .../Magento/Catalog/Block/NavigationTest.php | 2 +- .../Block/Product/ProductList/ToolbarTest.php | 16 +- .../Block/Product/View/OptionsTest.php | 2 +- .../Catalog/Block/Product/View/TabsTest.php | 2 +- .../Product/Initialization/HelperTest.php | 7 +- .../Initialization/StockDataFilterTest.php | 31 +- .../Helper/Product/Flat/IndexerTest.php | 6 +- .../Category/Attribute/Backend/SortbyTest.php | 4 +- .../Category/Flat/Plugin/StoreGroupTest.php | 8 +- .../Category/Flat/Plugin/StoreViewTest.php | 28 +- .../Model/Indexer/Category/Flat/StateTest.php | 26 +- .../Category/Flat/System/Config/ModeTest.php | 4 +- .../Product/Plugin/StoreGroupTest.php | 10 +- .../Category/Product/Plugin/StoreViewTest.php | 10 +- .../Product/Flat/Plugin/StoreGroupTest.php | 6 +- .../Indexer/Product/Flat/Plugin/StoreTest.php | 6 +- .../Model/Indexer/Product/Flat/StateTest.php | 4 +- .../Product/Flat/System/Config/ModeTest.php | 4 +- .../Indexer/Product/Price/ObserverTest.php | 18 +- .../Product/Price/Plugin/WebsiteTest.php | 2 +- .../Price/System/Config/PriceScopeTest.php | 4 +- .../Category/FilterableAttributeListTest.php | 4 +- .../Model/Layer/Category/StateKeyTest.php | 4 +- .../Layer/Search/CollectionFilterTest.php | 2 +- .../Search/FilterableAttributeListTest.php | 4 +- .../Model/Layer/Search/StateKeyTest.php | 4 +- .../Backend/Groupprice/AbstractTest.php | 4 +- .../Catalog/Model/Product/CopierTest.php | 2 +- .../Product/ReservedAttributeListTest.php | 69 + .../Magento/Catalog/Model/ProductTest.php | 2 +- .../Config/_files/product_types.php | 3 + .../Config/_files/product_types.xml | 4 +- .../Catalog/Model/Resource/AbstractTest.php | 2 +- .../Model/Resource/Eav/AttributeTest.php | 6 +- .../Model/Resource/Product/FlatTest.php | 8 +- .../Product/Option/CollectionTest.php | 4 +- .../Resource/Product/Option/ValueTest.php | 2 +- .../Model/Plugin/LayerTest.php | 22 +- .../CatalogInventory/Model/Stock/ItemTest.php | 107 + .../Search/AvailabilityFlag/PluginTest.php | 26 +- .../Model/Resource/EngineProviderTest.php | 22 +- .../Checkout/Block/Cart/AbstractTest.php | 4 +- .../Checkout/Block/Cart/SidebarTest.php | 2 +- .../Magento/Checkout/Controller/CartTest.php | 10 +- .../Magento/Checkout/Helper/DataTest.php | 65 +- .../Model/Layout/DepersonalizePluginTest.php | 6 +- .../Magento/Checkout/Model/SessionTest.php | 7 +- .../Checkout/Model/Type/AbstractTypeTest.php | 156 - .../Magento/Checkout/_files/session.php | 48 - .../Magento/Cms/Controller/NorouteTest.php | 12 +- .../testsuite/Magento/Code/MinifierTest.php | 73 +- .../Validator/NotProtectedExtensionTest.php | 19 +- .../Magento/Config/Data/ScopedTest.php | 6 +- .../Edit/Tab/Super/Config/MatrixTest.php | 9 +- .../Cart/Item/Renderer/ConfigurableTest.php | 20 +- .../Core/App/Action/Plugin/LastUrlTest.php | 2 +- .../Model/App/Action/ContextPluginTest.php | 16 +- .../Magento/Core/Model/Config/CacheTest.php | 119 - .../_files/app/etc/custom/config.xml | 29 - .../Core/Model/Config/Storage/DbTest.php | 111 - .../Magento/Core/Model/DesignLoaderTest.php | 10 +- .../File/Storage/Directory/DatabaseTest.php | 18 +- .../Model/Layout/DepersonalizePluginTest.php | 6 +- .../Magento/Core/Model/Layout/MergeTest.php | 4 +- .../Core/Model/Layout/_files/arguments.xml | 2 +- .../Magento/Core/Model/ObserverTest.php | 8 + .../TemplateEngine/Plugin/DebugHintsTest.php | 24 +- .../Core/Model/Theme/Image/PathTest.php | 6 +- .../Magento/Core/Model/Theme/ResolverTest.php | 284 + .../Core/Model/Theme/ThemeProviderTest.php | 2 +- .../Core/Model/Theme/ValidationTest.php | 167 +- .../Core/Model/Url/ScopeResolverTest.php | 2 +- .../Core/Model/Url/SecurityInfoTest.php | 18 +- .../Core/Model/View/Url/ConfigTest.php | 18 +- .../Cron/Model/Config/Reader/DbTest.php | 4 +- .../Cron/Model/Config/Reader/XmlTest.php | 2 +- .../Magento/Cron/Model/ObserverTest.php | 140 +- .../Customer/Block/Account/LinkTest.php | 2 +- .../Customer/Block/Form/RegisterTest.php | 10 +- .../Magento/Customer/Block/Widget/DobTest.php | 16 + .../Customer/Controller/AccountTest.php | 2 +- .../Magento/Customer/Helper/AddressTest.php | 16 +- .../Customer/Model/Address/ConfigTest.php | 15 +- .../Customer/Model/Backend/CustomerTest.php | 4 +- .../Magento/Customer/Model/CustomerTest.php | 28 +- .../Model/Layout/DepersonalizePluginTest.php | 16 +- .../Group/Grid/ServiceCollectionTest.php | 178 +- .../Magento/Customer/Model/SessionTest.php | 112 + .../Service/V1/CustomerAccountServiceTest.php | 403 +- .../Service/V1/CustomerAddressServiceTest.php | 8 +- .../Service/V1/CustomerCurrentServiceTest.php | 2 +- .../V1/CustomerMetadataServiceTest.php | 22 +- .../Block/Adminhtml/Editor/ContainerTest.php | 4 +- .../Editor/Tools/Code/CustomTest.php | 2 +- .../Selector/SelectorList/AbstractTest.php | 2 +- .../Adminhtml/System/Design/EditorTest.php | 12 +- .../DesignEditor/Model/AreaEmulatorTest.php | 2 +- .../Magento/DesignEditor/Model/StateTest.php | 38 +- .../Model/Url/NavigationModeTest.php | 2 +- .../Magento/Dhl/Model/CarrierTest.php | 24 +- .../Magento/Directory/Helper/DataTest.php | 23 +- .../Model/Currency/DefaultLocatorTest.php | 29 +- .../Model/Resource/Country/CollectionTest.php | 4 +- .../Downloadable/Helper/DownloadTest.php | 2 +- .../testsuite/Magento/Eav/Helper/DataTest.php | 4 +- .../Magento/Eav/Model/Entity/AbstractTest.php | 4 +- .../Attribute/Option/CollectionTest.php | 11 +- .../Model/Resource/Entity/AttributeTest.php | 2 +- .../Block/Adminhtml/Template/EditTest.php | 2 +- .../Magento/Email/Model/TemplateTest.php | 5 +- .../testsuite/Magento/Filter/TranslitTest.php | 2 +- .../Magento/GoogleAdwords/Helper/DataTest.php | 36 +- .../GoogleOptimizer/Helper/DataTest.php | 16 +- .../Model/Observer/Block/Category/TabTest.php | 2 +- .../Composite/Fieldset/GroupedTest.php | 28 +- .../Block/Cart/Item/Renderer/GroupedTest.php | 18 +- .../ListAssociatedProductsTest.php | 4 +- .../Model/Product/CatalogPriceTest.php | 4 +- .../Magento/Image/Adapter/Gd2Test.php | 6 +- .../Entity/Eav/Customer/AddressTest.php | 8 +- .../Model/Export/Entity/Eav/CustomerTest.php | 8 +- .../Import/Entity/CustomerCompositeTest.php | 38 +- .../Entity/Eav/Customer/AddressTest.php | 80 +- .../Model/Import/Entity/EavAbstractTest.php | 8 +- .../Import/Entity/Product/OptionTest.php | 6 +- .../Model/Import/Entity/ProductTest.php | 4 +- .../Model/Import/EntityAbstractTest.php | 77 +- .../Indexer/Model/Config/ReaderTest.php | 4 +- .../Magento/Install/Controller/WizardTest.php | 4 +- .../Install/Model/Installer/ConfigTest.php | 2 +- .../Magento/Install/Model/InstallerTest.php | 4 +- .../Controller/Adminhtml/IntegrationTest.php | 10 +- .../Integration/Helper/Oauth/ConsumerTest.php | 10 +- .../Integration/Helper/Oauth/DataTest.php | 28 +- .../Integration/Service/OauthV1Test.php | 2 +- .../Log/Model/Shell/Command/CleanTest.php | 20 +- .../Magento/Log/Model/VisitorTest.php | 69 + .../Mail/Template/TransportBuilderTest.php | 17 +- .../testsuite/Magento/Math/CalculatorTest.php | 2 +- .../testsuite/Magento/Message/ManagerTest.php | 6 +- .../Magento/Module/Dir/ReaderTest.php | 4 +- .../Setup/MigrationTest.php | 120 +- .../Setup/_files/data_content_plain_model.php | 10 +- .../_files/data_content_plain_pk_fields.php | 8 +- .../_files/data_content_plain_resource.php | 8 +- .../Setup/_files/data_content_serialized.php | 8 +- .../Setup/_files/data_content_wiki.php | 8 +- .../Setup/_files/data_content_xml.php | 8 +- .../Magento/Multishipping/Helper/DataTest.php | 20 +- .../Method/Specification/Is3DSecureTest.php | 12 +- .../Magento/Mview/Config/ReaderTest.php | 4 +- .../Model/Queue/TransportBuilderTest.php | 17 +- .../Magento/Newsletter/Model/TemplateTest.php | 8 +- .../Model/BanktransferTest.php | 4 +- .../Model/CashondeliveryTest.php | 4 +- .../Block/Adminhtml/Form/Field/ExportTest.php | 2 +- .../testsuite/Magento/Ogone/Model/ApiTest.php | 6 +- .../System/Config/Form/Field/ExportTest.php | 2 +- .../PageCache/Controller/BlockTest.php | 4 +- .../Magento/PageCache/Model/ConfigTest.php | 109 +- .../Model/Layout/LayoutPluginTest.php | 108 +- .../Magento/PageCache/Model/ObserverTest.php | 252 +- .../Payment/Block/Info/SubstitutionTest.php | 177 + .../Magento/Payment/Block/InfoTest.php | 4 +- .../Magento/Payment/Helper/DataTest.php | 98 + .../Payment/Model/Method/SubstitutionTest.php | 69 + .../Paypal/Model/Express/CheckoutTest.php | 78 + .../Magento/Paypal/Model/ObserverTest.php | 2 +- .../Block/Product/View/PriceTest.php | 12 +- .../Block/Product/View/StockTest.php | 12 +- .../Product/Edit/Tab/Price/RecurringTest.php | 10 +- .../Block/Payment/GridTest.php | 4 +- .../Block/Payment/Related/Orders/GridTest.php | 4 +- .../Block/Payment/View/AddressTest.php | 14 +- .../Block/Payment/View/DataTest.php | 6 +- .../Block/Payment/View/FeesTest.php | 6 +- .../Block/Payment/View/ItemTest.php | 6 +- .../Block/Payment/View/ReferenceTest.php | 6 +- .../Block/Payment/View/ScheduleTest.php | 6 +- .../Review/Block/Customer/RecentTest.php | 39 +- .../Adminhtml/Items/AbstractItemsTest.php | 4 +- .../Block/Adminhtml/Items/AbstractTest.php | 4 +- .../Adminhtml/Order/Create/Items/GridTest.php | 2 +- .../Sales/Block/Items/AbstractTest.php | 4 +- .../Magento/Sales/Model/Config/ReaderTest.php | 2 +- .../Magento/Sales/Model/Convert/QuoteTest.php | 97 + .../Quote/Address/VatValidatorTest.php | 2 +- .../Model/Order/Invoice/Total/TaxTest.php | 145 + .../Sales/Model/Order/Pdf/AbstractTest.php | 24 +- .../Sales/Model/Order/Pdf/InvoiceTest.php | 69 +- .../Rule/Action/Discount/CartFixedTest.php | 2 +- .../Service/DataObjectConverterTest.php | 219 + .../{Core/Model => }/Session/ConfigTest.php | 50 +- .../Shell/CommandRendererBackgroundTest.php | 75 + .../Magento/Shell/CommandRendererTest.php | 38 + .../unit/testsuite/Magento/ShellTest.php | 28 +- .../Magento/Shipping/Helper/CarrierTest.php | 20 +- .../App/Action/Plugin/StoreCheckTest.php | 10 +- .../Plugin/DispatchExceptionHandlerTest.php | 6 +- .../Plugin/RequestPreprocessorTest.php | 28 +- .../App}/Request/PathInfoProcessorTest.php | 16 +- .../{Core => Store}/Block/SwitchTest.php | 13 +- .../{Core => Store}/Helper/CookieTest.php | 57 +- .../Model/Config}/ConverterTest.php | 8 +- .../Config}/Processor/PlaceholderTest.php | 13 +- .../Config}/Reader/DefaultReaderTest.php | 10 +- .../Model/Config/Reader}/ReaderPoolTest.php | 57 +- .../Model/Config}/Reader/StoreTest.php | 50 +- .../Model/Config}/Reader/WebsiteTest.php | 22 +- .../Model}/Storage/DefaultTest.php | 28 +- .../Model}/StorageFactoryTest.php | 98 +- .../Model/StoreManagerTest.php | 64 +- .../Magento/Store/Model/StoresConfigTest.php | 114 + .../{Core => Store}/Model/WebsiteTest.php | 10 +- .../Di/Code/Scanner/DirectoryScannerTest.php | 2 +- .../Tools/Di/_files/app/etc/di/config.xml | 4 +- .../System/Configuration/ReaderTest.php | 2 +- .../System/Design/Theme/Tab/CssTest.php | 6 +- .../Magento/Theme/Block/Html/FooterTest.php | 2 +- .../Magento/Theme/Block/Html/HeadTest.php | 12 +- .../Magento/Theme/Block/Html/HeaderTest.php | 6 +- .../Theme/Model/Config/CustomizationTest.php | 8 +- .../Magento/Theme/Model/ConfigTest.php | 26 +- .../Magento/Translate/InlineTest.php | 6 +- .../unit/testsuite/Magento/TranslateTest.php | 235 + .../Translation/Model/Inline/ConfigTest.php | 29 +- .../App/Request/RewriteServiceTest.php | 2 +- dev/tests/unit/testsuite/Magento/UrlTest.php | 25 +- .../testsuite/Magento/User/Model/UserTest.php | 8 +- .../Magento/Usps/Model/CarrierTest.php | 20 +- .../Constraint/Option/CallbackTest.php | 4 +- .../Design/Theme/FlyweightFactoryTest.php | 4 +- .../Layout/ScheduledStructureTest.php | 62 +- .../{Core/Model => View}/LayoutTest.php | 82 +- .../Webapi/Controller/ErrorProcessorTest.php | 49 +- .../Rest/Response/Renderer/XmlTest.php | 2 +- .../Controller/Soap/Request/HandlerTest.php | 99 +- .../Magento/Webapi/Helper/DataTest.php | 10 - .../Magento/Webapi/Model/Soap/FaultTest.php | 3 - .../Magento/Webapi/Model/Soap/ServerTest.php | 22 +- .../Service/Entity/WebapiObjectManager.php | 7 +- .../soap_fault/soap_fault_expected_xmls.php | 1 - .../Magento/Weee/Helper/DataTest.php | 57 + .../Magento/Wishlist/Model/ConfigTest.php | 6 +- .../Migration/Acl/log/AclXPathToAclId.log | 2 +- .../aliases_map/composite_modules_ce.php | 4 +- .../factory_table_names/replace_ce.php | 6 +- .../Magento/Tools/Migration/themes_view.php | 8 +- .../CentinelClient.php | 0 .../CentinelErrors.php | 0 .../XMLParser.php | 0 lib/Magento/App/Config.php | 22 +- .../Model => lib/Magento/App}/Config/Base.php | 6 +- .../Magento/App}/Config/BaseFactory.php | 6 +- lib/Magento/App/Config/Data.php | 2 +- .../Magento/App}/Config/Element.php | 8 +- .../Magento/App}/Config/FileResolver.php | 2 +- lib/Magento/App/Config/Initial.php | 2 +- .../MutableScopeConfigInterface.php} | 27 +- .../ReinitableConfigInterface.php | 7 +- .../Config/Resource/ConfigInterface.php} | 26 +- .../App/Config/ScopeConfigInterface.php | 35 +- lib/Magento/App/Config/ScopePool.php | 38 +- .../Magento/App/Config/Storage/Writer.php | 16 +- .../App/Config/Storage/WriterInterface.php | 4 +- .../Magento/App}/Config/Value.php | 50 +- .../Magento/App}/Config/ValueFactory.php | 2 +- lib/Magento/App/Config/ValueInterface.php | 4 +- .../DirectoryList/Configuration.php | 4 +- lib/Magento/App/MutableScopeConfig.php | 47 + lib/Magento/App/ReinitableConfig.php | 2 +- .../ScopeInterface.php} | 4 +- .../ScopeResolverInterface.php} | 6 +- lib/Magento/App/ScopeResolverPool.php | 59 + lib/Magento/App/View.php | 1 - lib/Magento/AppInterface.php | 2 +- lib/Magento/Code/Minifier.php | 10 +- lib/Magento/Exception/Exception.php | 2 +- lib/Magento/Filter/Translit.php | 4 +- lib/Magento/Image/Adapter/Config.php | 6 +- lib/Magento/Image/Adapter/Gd2.php | 15 +- lib/Magento/Locale/Format.php | 6 +- .../Locale/Hierarchy/Config/Converter.php | 2 +- lib/Magento/Locale/Lists.php | 6 +- lib/Magento/Locale/Resolver.php | 28 +- lib/Magento/Locale/ResolverInterface.php | 2 +- .../Mail/Template/TransportBuilder.php | 19 +- .../Mail/TransportInterfaceFactory.php | 70 + lib/Magento/Math/Calculator.php | 6 +- lib/Magento/Message/Manager.php | 4 +- lib/Magento/Model/AbstractModel.php | 11 +- .../Magento}/Module/Output/Config.php | 25 +- lib/Magento/Module/ResourceInterface.php | 5 +- lib/Magento/Module/Setup.php | 801 + .../Magento/Module}/Setup/Context.php | 42 +- .../Magento/Module}/Setup/Migration.php | 94 +- lib/Magento/Module/Setup/MigrationData.php | 103 + .../Magento/Module/Setup/MigrationFactory.php | 50 +- lib/Magento/{OSInfo.php => OsInfo.php} | 2 +- .../Service/Data/EAV/AbstractObject.php | 2 +- lib/Magento/Service/DataObjectConverter.php | 67 + .../Magento}/Service/V1/Data/Filter.php | 9 +- .../Service/V1/Data/FilterBuilder.php | 7 +- .../Model => lib/Magento}/Session/Config.php | 38 +- lib/Magento/Session/Generic.php | 4 +- lib/Magento/Session/SessionManager.php | 6 +- .../Magento}/Session/SidResolver.php | 31 +- .../Magento}/Session/Validator.php | 44 +- lib/Magento/Shell.php | 60 +- lib/Magento/Shell/CommandRenderer.php | 44 + .../Shell/CommandRendererBackground.php | 59 + .../Shell/CommandRendererInterface.php | 23 +- lib/Magento/ShellInterface.php | 42 + lib/Magento/Stdlib/DateTime/Timezone.php | 34 +- .../Stdlib/DateTime/TimezoneInterface.php | 2 +- lib/Magento/Translate.php | 21 +- lib/Magento/Translate/Inline.php | 20 +- .../Translate/Inline/ConfigInterface.php | 4 +- lib/Magento/Url.php | 38 +- lib/Magento/Url/ScopeInterface.php | 10 +- lib/Magento/Url/ScopeResolverInterface.php | 2 +- lib/Magento/View/Context.php | 26 +- .../View/Design/Theme/ResolverInterface.php | 37 + lib/Magento/View/Design/Theme/Validator.php | 2 +- lib/Magento/View/DesignLoader.php | 12 +- lib/Magento/View/Element/AbstractBlock.php | 15 +- lib/Magento/View/Element/Context.php | 20 +- .../Magento/View/Element/FormKey.php | 16 +- lib/Magento/View/Element/Html/Calendar.php | 17 +- lib/Magento/View/Element/Template.php | 7 +- lib/Magento/View/Element/Template/Context.php | 14 +- .../Model => lib/Magento/View}/Layout.php | 130 +- .../Magento/View/Layout/Factory.php | 25 +- lib/Magento/View/Layout/Proxy.php | 928 + .../View}/Layout/ScheduledStructure.php | 6 +- lib/Magento/View/LayoutInterface.php | 15 - lib/Magento/Xml/Generator.php | 21 +- lib/flex/uploader/uploader.mxml | 74 - lib/flex/uploader/uploaderSingle.mxml | 89 - lib/flex/varien/varien/upload/Uploader.as | 627 - .../varien/varien/upload/UploaderEvent.as | 82 - .../varien/varien/upload/UploaderSingle.as | 90 - pub/cron.php | 7 +- pub/lib/css/docs/docs.css | 2 +- pub/lib/css/source/lib/buttons.less | 6 +- pub/lib/css/source/lib/dropdowns.less | 41 +- pub/lib/css/source/lib/icons.less | 2 +- pub/lib/css/source/lib/layout.less | 1 - pub/lib/css/source/lib/lib.less | 4 +- pub/lib/css/source/lib/navigation.less | 1 - pub/lib/css/source/lib/variables.less | 6 + .../Blank-Theme-Icons/Blank-Theme-Icons.eot | Bin 6044 -> 6268 bytes .../Blank-Theme-Icons/Blank-Theme-Icons.svg | 4 + .../Blank-Theme-Icons/Blank-Theme-Icons.ttf | Bin 5840 -> 6064 bytes .../Blank-Theme-Icons/Blank-Theme-Icons.woff | Bin 4536 -> 4720 bytes pub/lib/images/logo.svg | 128 + .../jquery/handlebars/handlebars-v1.3.0.js | 2746 +++ pub/lib/jquery/jquery-1.8.2.js | 9440 ++++++++++ pub/lib/jquery/jquery-migrate.js | 521 + pub/lib/jquery/jquery-migrate.min.js | 2 + pub/lib/jquery/jquery-ui-1.9.2.js | 14933 ++++++++++++++++ pub/lib/jquery/jquery-ui.js | 7995 +++++---- pub/lib/jquery/jquery-ui.min.js | 12 + pub/lib/jquery/jquery.js | 13905 +++++++------- pub/lib/jquery/jquery.min.js | 4 + pub/lib/mage/accordion.js | 2 +- pub/lib/mage/adminhtml/varienLoader.js | 2 +- pub/lib/mage/backend/floating-header.js | 2 + pub/lib/mage/dropdown.js | 16 +- pub/lib/mage/loader.js | 22 +- pub/lib/mage/loader_old.js | 183 + .../di.xml => pub/lib/mage/tabs.js | 11 +- pub/opt/magento/var/resource_config.json | 1 + 2427 files changed, 79432 insertions(+), 40446 deletions(-) create mode 100644 app/code/Magento/Backend/Block/Page/Locale.php rename app/code/Magento/{SalesRule/Model/Resource/Setup.php => Backend/Model/Resource/Translate.php} (72%) rename app/code/Magento/{Core/Model/Resource/Setup/Generic.php => Backend/Model/Resource/Translate/String.php} (69%) rename app/code/Magento/{Service/etc/module.xml => Backend/view/adminhtml/layout/adminhtml_system_variable_edit.xml} (74%) create mode 100644 app/code/Magento/Backend/view/adminhtml/page/locale.phtml rename app/code/Magento/{Core/view/frontend/formkey.phtml => Backend/view/adminhtml/pageactions.phtml} (81%) mode change 100755 => 100644 app/code/Magento/Catalog/Helper/Product/Composite.php create mode 100644 app/code/Magento/Catalog/Model/Product/ReservedAttributeList.php create mode 100644 app/code/Magento/Catalog/sql/catalog_setup/install-1.6.0.0.php rename app/code/Magento/Catalog/view/frontend/product/view/{rating.phtml => review.phtml} (93%) create mode 100644 app/code/Magento/CatalogSearch/etc/di.xml create mode 100644 app/code/Magento/Centinel/view/adminhtml/order/create/abstract.phtml delete mode 100644 app/code/Magento/Checkout/Model/Type/AbstractType.php rename app/code/Magento/{Contacts => Contact}/Controller/Index.php (79%) rename app/code/Magento/{Contacts => Contact}/Helper/Data.php (78%) rename app/code/Magento/{Contacts => Contact}/Model/System/Config/Backend/Links.php (79%) rename app/code/Magento/{Contacts => Contact}/etc/adminhtml/acl.xml (90%) rename app/code/Magento/{Contacts => Contact}/etc/adminhtml/system.xml (84%) rename app/code/Magento/{Contacts => Contact}/etc/config.xml (84%) rename app/code/Magento/{Contacts => Contact}/etc/email_templates.xml (88%) rename app/code/Magento/{Contacts => Contact}/etc/frontend/di.xml (94%) rename app/code/Magento/{Contacts => Contact}/etc/frontend/page_types.xml (94%) rename app/code/Magento/{Contacts => Contact}/etc/frontend/routes.xml (92%) rename app/code/Magento/{Contacts => Contact}/etc/module.xml (89%) rename app/code/Magento/{Contacts => Contact}/i18n/de_DE.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/en_US.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/es_ES.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/fr_FR.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/nl_NL.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/pt_BR.csv (100%) rename app/code/Magento/{Contacts => Contact}/i18n/zh_CN.csv (100%) rename app/code/Magento/{Contacts/sql/contacts_setup => Contact/sql/contact_setup}/install-1.6.0.0.php (94%) rename app/code/Magento/{Contacts => Contact}/view/email/submitted_form.html (100%) rename app/code/Magento/{Contacts => Contact}/view/frontend/form.phtml (93%) rename app/code/Magento/{Contacts/view/frontend/layout/contacts_index_index.xml => Contact/view/frontend/layout/contact_index_index.xml} (96%) rename app/code/Magento/{Contacts => Contact}/view/frontend/layout/default.xml (92%) delete mode 100644 app/code/Magento/Core/Model/Config/Cache.php delete mode 100644 app/code/Magento/Core/Model/Session.php delete mode 100644 app/code/Magento/Core/Model/Store/Config.php delete mode 100644 app/code/Magento/Core/Model/Store/ConfigInterface.php delete mode 100644 app/code/Magento/Core/Model/Store/StorageFactory.php create mode 100644 app/code/Magento/Core/Model/Theme/Resolver.php delete mode 100644 app/code/Magento/Core/sql/core_setup/oracle-upgrade-1.6.0.0-1.6.0.1.php create mode 100644 app/code/Magento/CurrencySymbol/etc/di.xml create mode 100644 app/code/Magento/Customer/Service/V1/Data/CustomerValidationResults.php create mode 100644 app/code/Magento/Customer/Service/V1/Data/CustomerValidationResultsBuilder.php create mode 100644 app/code/Magento/Directory/Helper/Url.php create mode 100644 app/code/Magento/GoogleAnalytics/etc/di.xml create mode 100644 app/code/Magento/Install/Model/Setup.php delete mode 100644 app/code/Magento/Newsletter/Model/Resource/Setup.php create mode 100644 app/code/Magento/Payment/Block/Info/Substitution.php rename app/code/Magento/{Core/Model/StoreManagerInterface.php => Payment/Model/Method/Substitution.php} (58%) rename dev/tests/unit/testsuite/Magento/Core/Model/Config/FileResolver/_files/app/etc/config.xml => app/code/Magento/Payment/view/adminhtml/info/substitution.phtml (85%) rename app/code/Magento/{Rating/etc/adminhtml/events.xml => ProductAlert/etc/di.xml} (73%) delete mode 100644 app/code/Magento/Rating/Block/Adminhtml/Edit/Tab/Options.php delete mode 100644 app/code/Magento/Rating/Model/Observer.php delete mode 100644 app/code/Magento/Rating/data/rating_setup/data-install-1.6.0.0.php delete mode 100644 app/code/Magento/Rating/etc/adminhtml/acl.xml delete mode 100644 app/code/Magento/Rating/etc/adminhtml/routes.xml delete mode 100644 app/code/Magento/Rating/i18n/de_DE.csv delete mode 100644 app/code/Magento/Rating/i18n/en_US.csv delete mode 100644 app/code/Magento/Rating/i18n/es_ES.csv delete mode 100644 app/code/Magento/Rating/i18n/fr_FR.csv delete mode 100644 app/code/Magento/Rating/i18n/nl_NL.csv delete mode 100644 app/code/Magento/Rating/i18n/pt_BR.csv delete mode 100644 app/code/Magento/Rating/i18n/zh_CN.csv delete mode 100644 app/code/Magento/Rating/sql/rating_setup/install-1.6.0.0.php delete mode 100644 app/code/Magento/Rating/sql/rating_setup/upgrade-1.6.0.0-1.6.0.1.php create mode 100644 app/code/Magento/Reports/view/adminhtml/layout/reports_report_product_downloads.xml rename app/code/Magento/{Core/view/frontend/layout/default.xml => Reports/view/adminhtml/layout/reports_report_shopcart_abandoned.xml} (65%) rename app/code/Magento/{Rating => Review}/Block/Adminhtml/Rating.php (90%) rename app/code/Magento/{Rating/Block/Adminhtml => Review/Block/Adminhtml/Rating}/Edit.php (86%) rename app/code/Magento/{Rating/Block/Adminhtml => Review/Block/Adminhtml/Rating}/Edit/Form.php (88%) rename app/code/Magento/{Rating/Block/Adminhtml => Review/Block/Adminhtml/Rating}/Edit/Tab/Form.php (94%) rename app/code/Magento/{Rating/Block/Adminhtml => Review/Block/Adminhtml/Rating}/Edit/Tabs.php (70%) create mode 100644 app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php rename app/code/Magento/{Rating/Block => Review/Block/Rating}/Entity/Detailed.php (90%) rename app/code/Magento/{Rating/Controller/Adminhtml/Index.php => Review/Controller/Adminhtml/Rating.php} (84%) rename app/code/Magento/{Rating => Review}/Model/Rating.php (85%) rename app/code/Magento/{Rating => Review}/Model/Rating/Entity.php (80%) rename app/code/Magento/{Rating => Review}/Model/Rating/Option.php (75%) rename app/code/Magento/{Rating => Review}/Model/Rating/Option/Vote.php (87%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating.php (93%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Collection.php (94%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Entity.php (94%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Grid/Collection.php (85%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Option.php (95%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Option/Collection.php (90%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Option/Vote.php (91%) rename app/code/Magento/{Rating => Review}/Model/Resource/Rating/Option/Vote/Collection.php (89%) rename app/code/Magento/{Catalog => Review}/view/adminhtml/js/rating.js (100%) rename app/code/Magento/{Rating => Review}/view/adminhtml/layout/rating_block.xml (97%) rename app/code/Magento/{Rating/view/adminhtml/layout/rating_index_index.xml => Review/view/adminhtml/layout/review_rating_index.xml} (95%) rename app/code/Magento/{Rating => Review}/view/adminhtml/rating/detailed.phtml (97%) rename app/code/Magento/{Rating => Review}/view/adminhtml/rating/options.phtml (100%) rename app/code/Magento/{Rating => Review}/view/adminhtml/rating/stars/detailed.phtml (100%) rename app/code/Magento/{Rating => Review}/view/adminhtml/rating/stars/summary.phtml (100%) rename app/code/Magento/{Rating => Review}/view/adminhtml/rating/validation-rules.js (98%) rename app/code/Magento/{Rating => Review}/view/frontend/detailed.phtml (100%) rename app/code/Magento/{Rating => Review}/view/frontend/empty.phtml (100%) create mode 100644 app/code/Magento/Shipping/Model/Carrier/Source/GenericDefault.php rename app/code/Magento/{Core => Store}/App/Action/Plugin/StoreCheck.php (86%) rename app/code/Magento/{Core => Store}/App/FrontController/Plugin/DispatchExceptionHandler.php (91%) rename app/code/Magento/{Core => Store}/App/FrontController/Plugin/RequestPreprocessor.php (82%) rename app/code/Magento/{Core => Store}/App/Request/PathInfoProcessor.php (89%) rename app/code/Magento/{Core => Store}/App/Response/Redirect.php (96%) rename app/code/Magento/{Core => Store}/Block/Store/Switcher.php (85%) rename app/code/Magento/{Core => Store}/Block/Switcher.php (87%) rename app/code/Magento/{Core => Store}/Helper/Cookie.php (76%) rename app/code/Magento/{Core/Model/Config/Scope/Store => Store/Model/Config}/Converter.php (71%) rename app/code/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Processor/Placeholder.php (83%) rename app/code/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/DefaultReader.php (84%) rename app/code/Magento/{Core/Model/Config/Scope => Store/Model/Config/Reader}/ReaderPool.php (71%) rename app/code/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/Store.php (60%) rename app/code/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/Website.php (82%) rename app/code/Magento/{Rating/Helper/Data.php => Store/Model/Exception.php} (85%) rename app/code/Magento/{Core/Model/Store => Store/Model}/Group.php (85%) rename app/code/Magento/{Core/Model/Store => Store/Model}/Group/Factory.php (91%) rename app/code/Magento/{Core/Model/BaseScopeResolver.php => Store/Model/Resolver/Store.php} (73%) rename app/code/Magento/{Core/Model/Store/StorageInterface.php => Store/Model/Resolver/Website.php} (54%) rename app/code/Magento/{Core/Model/Resource/Config/Value => Store/Model/Resource/Config}/Collection/Scoped.php (97%) rename app/code/Magento/{Core/Model/Resource/Store => Store/Model/Resource}/Group.php (87%) rename app/code/Magento/{Core/Model/Resource/Store => Store/Model/Resource}/Group/Collection.php (90%) rename app/code/Magento/{Core => Store}/Model/Resource/Store.php (87%) rename app/code/Magento/{Core => Store}/Model/Resource/Store/Collection.php (91%) rename app/code/Magento/{Core => Store}/Model/Resource/Website.php (88%) rename app/code/Magento/{Core => Store}/Model/Resource/Website/Collection.php (92%) rename app/code/Magento/{Core => Store}/Model/Resource/Website/Grid/Collection.php (79%) rename app/code/Magento/{Core => Store}/Model/ScopeInterface.php (88%) rename app/code/Magento/{Core/Model/Store => Store/Model}/Storage/Db.php (82%) rename app/code/Magento/{Core/Model/Store => Store/Model}/Storage/DefaultStorage.php (70%) create mode 100644 app/code/Magento/Store/Model/StorageFactory.php rename app/code/Magento/{Core => Store}/Model/Store.php (87%) rename app/code/Magento/{Core => Store}/Model/StoreManager.php (83%) rename app/code/Magento/{Core/Model/Store/ListInterface.php => Store/Model/StoreManagerInterface.php} (76%) create mode 100644 app/code/Magento/Store/Model/StoresConfig.php rename app/code/Magento/{Core => Store}/Model/System/Store.php (94%) rename app/code/Magento/{Core => Store}/Model/Website.php (83%) rename app/code/Magento/{Core => Store}/Model/Website/Factory.php (86%) create mode 100644 app/code/Magento/Store/etc/di.xml rename app/code/Magento/{Rating/etc/adminhtml => Store/etc/frontend}/di.xml (84%) rename app/code/Magento/{Rating => Store}/etc/module.xml (83%) create mode 100644 app/code/Magento/Store/sql/store_setup/install-2.0.0.0.php rename app/code/Magento/{Core => Store}/view/frontend/switch/flags.phtml (97%) rename app/code/Magento/{Core => Store}/view/frontend/switch/languages.phtml (98%) rename app/code/Magento/{Core => Store}/view/frontend/switch/stores.phtml (96%) rename app/code/Magento/{Core => Theme}/view/frontend/js/msg-box.js (98%) rename app/code/Magento/{Service/AuthorizationException.php => Webapi/ServiceAuthorizationException.php} (95%) rename app/code/Magento/{Service/Exception.php => Webapi/ServiceException.php} (95%) rename app/code/Magento/{Service/ResourceNotFoundException.php => Webapi/ServiceResourceNotFoundException.php} (94%) create mode 100644 app/design/adminhtml/Magento/backend/Magento_AdminNotification/css/source/module.less create mode 100644 app/design/adminhtml/Magento/backend/Magento_Backend/css/source/module.less rename app/design/adminhtml/{magento_backend => Magento/backend}/Magento_Backend/images/logo-magento-small.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/Magento_Backend/images/logo-magento.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/Magento_Backend/layout/default.xml (91%) create mode 100644 app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/css/source/module.less create mode 100644 app/design/adminhtml/Magento/backend/Magento_Theme/css/source/module.less create mode 100644 app/design/adminhtml/Magento/backend/css/admin.css rename app/design/adminhtml/{magento_backend => Magento/backend}/css/header.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/css/pages.css (93%) rename app/design/adminhtml/{magento_backend/less/styles.less => Magento/backend/css/source/abstract.less} (64%) create mode 100644 app/design/adminhtml/Magento/backend/css/source/dashboard.less create mode 100644 app/design/adminhtml/Magento/backend/css/source/navigation.less create mode 100644 app/design/adminhtml/Magento/backend/css/source/theme.less create mode 100644 app/design/adminhtml/Magento/backend/css/styles.less rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBlack-webfont.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBlack-webfont.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBlack-webfont.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBlack-webfont.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBold-webfont.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBold-webfont.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBold-webfont.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansBold-webfont.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansLight-webfont.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansLight-webfont.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansLight-webfont.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansLight-webfont.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansRegular-webfont.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansRegular-webfont.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansRegular-webfont.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansRegular-webfont.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansSemiBold-webfont.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansSemiBold-webfont.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansSemiBold-webfont.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/calluna/CallunaSansSemiBold-webfont.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/icons/admin-icons.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/icons/admin-icons.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/icons/admin-icons.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/fonts/icons/admin-icons.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/i18n/en_US.csv (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/ajax-loader-tr.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/ajax-loader.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/body-bg.jpg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/cancel_icon.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/edit_icon.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_application_form_delete.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_bin.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_bullet_disk.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_leaf.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_link.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_package_go.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/fam_refresh.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/grid-cal.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/grouped_to_order_icon.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/ico_success.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/pager_arrow_left_off.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/pager_arrow_right_off.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/process_spinner.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/rule_chooser_trigger.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/rule_component_add.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/rule_component_apply.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/rule_component_remove.gif (100%) create mode 100644 app/design/adminhtml/Magento/backend/images/select-bg.svg rename app/design/adminhtml/{magento_backend => Magento/backend}/images/subconfig-bg.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/images/switcher.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/js/theme.js (86%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/all.less (98%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/arrows.less (96%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/grids.less (96%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/helpers.less (97%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/icons.less (96%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/resets.less (95%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/settings.less (98%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/sprites.less (97%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/clearless/typography.less (98%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/lib/buttons.less (78%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/admin.less (76%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/base.less (92%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/debug.less (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/header.less (99%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/pages.less (91%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/styles/vars.less (97%) rename app/design/adminhtml/{magento_backend => Magento/backend}/less/vars.less (96%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/base.css (84%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/components.css (99%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/elements.css (99%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/fonts/MUI-Icons.eot (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/fonts/MUI-Icons.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/fonts/MUI-Icons.ttf (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/fonts/MUI-Icons.woff (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/form.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/grid.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/icons.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/ajax-loader-big.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/ajax-loader-small.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/ajax-loader-white.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/ajax-loader.gif (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/ajax-loader.svg (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/pagination-arrows-bg.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/rating-bg.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/sorter-bg.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/images/view-mode-bg.png (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/print.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/reset.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/mui/utils.css (100%) rename app/design/adminhtml/{magento_backend => Magento/backend}/theme.xml (93%) delete mode 100644 app/design/adminhtml/magento_backend/css/admin.css delete mode 100644 app/design/adminhtml/magento_backend/css/styles-ie8.css delete mode 100644 app/design/adminhtml/magento_backend/images/icons-dashboard-switcher.png delete mode 100644 app/design/adminhtml/magento_backend/less/styles/styles-ie8.less rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Bundle/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Catalog/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Catalog/css/source/widgets.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Catalog/layout/catalog_product_view.xml (91%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_CatalogSearch/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Checkout/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Checkout/layout/checkout_cart_index.xml (95%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Cms/css/source/widgets.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Customer/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Downloadable/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Newsletter/css/source/module.less (100%) rename app/design/frontend/{magento_blank/MAgento_Paypal => Magento/blank/Magento_Paypal}/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Reports/css/source/widgets.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Review/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Sales/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Sales/css/source/widgets.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Sendfriend/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Theme/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Theme/layout/default.xml (92%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Theme/layout/default_head_blocks.xml (93%) rename app/design/frontend/{magento_blank => Magento/blank}/Magento_Wishlist/css/source/module.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/print.less (98%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/abstract.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/actions-toolbar.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/breadcrumbs.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/buttons.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/dropdowns.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/forms.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/icons.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/layout.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/loaders.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/messages.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/navigation.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/pages.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/popups.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/rating.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/sections.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/tables.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/theme.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/tooltips.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/source/typography.less (100%) rename app/design/frontend/{magento_blank => Magento/blank}/css/styles.less (99%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/bold/opensans-700.eot (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/bold/opensans-700.svg (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/bold/opensans-700.ttf (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/bold/opensans-700.woff (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/light/opensans-300.eot (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/light/opensans-300.svg (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/light/opensans-300.ttf (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/light/opensans-300.woff (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/regular/opensans-400.eot (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/regular/opensans-400.svg (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/regular/opensans-400.ttf (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/regular/opensans-400.woff (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/semibold/opensans-600.eot (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/semibold/opensans-600.svg (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/semibold/opensans-600.ttf (100%) rename app/design/frontend/{magento_blank => Magento/blank}/fonts/opensans/semibold/opensans-600.woff (100%) rename app/design/frontend/{magento_blank => Magento/blank}/images/logo.gif (100%) rename app/design/frontend/{magento_blank => Magento/blank}/js/navigation-menu.js (100%) rename app/design/frontend/{magento_blank => Magento/blank}/js/responsive.js (100%) rename app/design/frontend/{magento_blank => Magento/blank}/js/theme.js (100%) rename app/design/frontend/{magento_blank => Magento/blank}/media/preview.jpg (100%) rename app/design/frontend/{magento_blank => Magento/blank}/theme.xml (93%) rename app/design/frontend/{magento_blank => Magento/blank}/view.xml (99%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Catalog/layout/catalog_category_view.xml (93%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Catalog/layout/catalog_product_view.xml (93%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Catalog/layout/default.xml (92%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Checkout/layout/checkout_cart_index.xml (96%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Customer/layout/default.xml (94%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_DesignEditor/controls/image_sizing.xml (99%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_DesignEditor/controls/quick_styles.xml (99%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Reports/layout/catalog_product_view.xml (95%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Review/layout/catalog_product_view.xml (95%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Review/layout/review_product_list.xml (93%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Theme/layout/default.xml (95%) rename app/design/frontend/{magento_plushe => Magento/plushe}/Magento_Theme/layout/default_head_blocks.xml (97%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/print.css (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/all.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/arrows.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/grids.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/helpers.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/icons.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/resets.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/settings.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/sprites.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/clearless/typography.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/buttons.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/forms.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/grids.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/icons.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/messages.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/navigation.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/sections.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/lib/snippets.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/responsive/responsive.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/styles/base.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/styles/magento.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/source/vars.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/css/styles.less (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/.htaccess (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/icons/icons.dev.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/icons/icons.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/icons/icons.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/icons/icons.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/icons/icons.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/marvel/OFL.txt (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/marvel/marvel-400-normal-webfont.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/marvel/marvel-400-normal-webfont.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/marvel/marvel-400-normal-webfont.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/marvel/marvel-400-normal-webfont.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-200-normal-webfont.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-200-normal-webfont.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-200-normal-webfont.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-200-normal-webfont.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-400-normal-webfont.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-400-normal-webfont.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-400-normal-webfont.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-400-normal-webfont.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-600-normal-webfont.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-600-normal-webfont.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-600-normal-webfont.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-600-normal-webfont.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-700-normal-webfont.eot (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-700-normal-webfont.svg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-700-normal-webfont.ttf (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/fonts/sourcesanspro/sourcesanspro-700-normal-webfont.woff (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/i18n/en_US.csv (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/banner1.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/banner2.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/banner3.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/banner4.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/blog_bg.png (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/express-checkout-retina.png (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/header-bg.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/info_photo.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/loader.gif (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/logo.gif (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/logo_notext.gif (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/main_image1.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/social-links.png (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/images/texture.png (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/jquery.dropdowns.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/navigation-menu.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/responsive.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/sticky.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/tabs.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/js/theme.js (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/mage/gallery.css (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/media/preview.jpg (100%) rename app/design/frontend/{magento_plushe => Magento/plushe}/theme.xml (93%) rename app/design/frontend/{magento_plushe => Magento/plushe}/view.xml (99%) rename app/design/install/{magento_basic => Magento/basic}/css/boxes.css (100%) rename app/design/install/{magento_basic => Magento/basic}/css/clears.css (100%) rename app/design/install/{magento_basic => Magento/basic}/css/ie7minus.css (100%) rename app/design/install/{magento_basic => Magento/basic}/css/iestyles.css (100%) rename app/design/install/{magento_basic => Magento/basic}/css/reset.css (100%) rename app/design/install/{magento_basic => Magento/basic}/images/error_msg_icon.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_container_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_info_separator.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_informational_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_left.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_legality_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/footer_right.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/header_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/header_nav_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/header_top_bg.jpg (100%) rename app/design/install/{magento_basic => Magento/basic}/images/header_top_container_bg.jpg (100%) rename app/design/install/{magento_basic => Magento/basic}/images/i_notice.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/main_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/main_container_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/note_msg_icon.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/success_msg_icon.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/images/validation_advice_bg.gif (100%) rename app/design/install/{magento_basic => Magento/basic}/theme.xml (93%) create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Listener/ExtededTestdox.php rename dev/tests/integration/testsuite/Magento/{Core/Model => App}/Config/BaseTest.php (84%) rename dev/tests/integration/testsuite/Magento/{Core/Model => App}/Config/DataTest.php (94%) rename dev/tests/integration/testsuite/Magento/{Core/Model => App}/Config/ElementTest.php (92%) create mode 100644 dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Core/Model/Session/AbstractSession/VarienTest.php delete mode 100644 dev/tests/integration/testsuite/Magento/Customer/Helper/DataTest.php rename dev/tests/integration/testsuite/Magento/{Core/Model/Resource => DB}/TransactionTest.php (86%) create mode 100644 dev/tests/integration/testsuite/Magento/Log/Model/VisitorTest.php rename dev/tests/integration/testsuite/Magento/{Core/Model/Resource => Module}/SetupTest.php (81%) create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/AddressesTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Controller/Billing/AgreementTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payment_express_with_customer.php rename dev/tests/integration/testsuite/Magento/{Rating => Review}/Block/Adminhtml/Edit/Tab/FormTest.php (87%) rename dev/tests/integration/testsuite/Magento/{Core/Model => }/Session/ConfigTest.php (89%) rename dev/tests/integration/testsuite/Magento/{Core/Model => }/Session/SidResolverTest.php (83%) rename dev/tests/integration/testsuite/Magento/{Core/Model/Store => Store/Model}/GroupTest.php (82%) rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/Resource/Store/CollectionTest.php (86%) rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/Resource/StoreTest.php (89%) rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/Resource/WebsiteTest.php (89%) rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/StoreTest.php (85%) rename dev/tests/integration/testsuite/Magento/{Core => Store}/Model/WebsiteTest.php (88%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/LayoutArgumentObjectUpdater.php (97%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/LayoutArgumentSimpleUpdater.php (97%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/LayoutDirectivesTest.php (99%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/LayoutTest.php (92%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/Layout.php (85%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/LayoutTest.php (92%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/_files/layout/handle_one.xml (87%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/_files/layout/handle_three.xml (84%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/_files/layout/handle_two.xml (86%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/_files/layout_merged/multiple_handles.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core => View}/Utility/_files/layout_merged/single_handle.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout/cacheable.xml (89%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout/container_attributes.xml (93%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout/non_cacheable.xml (89%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/action_for_anonymous_parent_block.xml (90%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/arguments.xml (91%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/arguments_complex_values.xml (94%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/arguments_object_type.xml (92%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/arguments_object_type_updaters.xml (79%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/arguments_url_type.xml (92%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/get_block.xml (88%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/get_block_exception.xml (88%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/group.xml (94%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/ifconfig.xml (93%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/move.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/move_alias_broken.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/move_broken.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/move_new_alias.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/move_the_same_alias.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/remove.xml (100%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/remove_broken.xml (90%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/render.xml (93%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/sort_after_after.xml (92%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/sort_after_previous.xml (92%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/sort_before_after.xml (91%) rename dev/tests/integration/testsuite/Magento/{Core/Model => View}/_files/layout_directives_test/sort_before_before.xml (92%) create mode 100644 dev/tests/integration/testsuite/Magento/Weee/Model/TaxTest.php create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/Block/Share/WishlistTest.php create mode 100644 dev/tests/js/framework/qunit/qunit-1.14.0.css create mode 100644 dev/tests/js/framework/qunit/qunit-1.14.0.js create mode 100644 dev/tests/js/testsuite/mage/_demo/index.html rename dev/tests/{unit/testsuite/Magento/Core/Model/Config/FileResolver/_files/primary/app/etc/di.xml => js/testsuite/mage/_demo/test.js} (88%) create mode 100644 dev/tests/js/testsuite/mage/loader/jquery-loader-test.js create mode 100644 dev/tests/js/testsuite/mage/loader/loader.html delete mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/ConcreteImplementationTest.php delete mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/_files/classes/blacklist.txt rename dev/tests/unit/testsuite/Magento/{Core/Model => App}/Config/FileResolverTest.php (96%) create mode 100644 dev/tests/unit/testsuite/Magento/App/HttpTest.php create mode 100644 dev/tests/unit/testsuite/Magento/App/ResourceTest.php create mode 100644 dev/tests/unit/testsuite/Magento/App/Route/Config/SchemaLocatorTest.php create mode 100644 dev/tests/unit/testsuite/Magento/App/Router/DefaultRouterTest.php create mode 100644 dev/tests/unit/testsuite/Magento/App/ScopeResolverPoolTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Backend/Block/Store/SwitcherTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ReservedAttributeListTest.php create mode 100644 dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Checkout/Model/Type/AbstractTypeTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Checkout/_files/session.php delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Config/CacheTest.php delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Config/FileResolver/_files/app/etc/custom/config.xml delete mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Config/Storage/DbTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Core/Model/Theme/ResolverTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Customer/Model/SessionTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/MigrationTest.php (70%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_plain_model.php (87%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_plain_pk_fields.php (86%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_plain_resource.php (86%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_serialized.php (86%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_wiki.php (88%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Resource => Module}/Setup/_files/data_content_xml.php (89%) create mode 100644 dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Payment/Helper/DataTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Payment/Model/Method/SubstitutionTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Sales/Model/Convert/QuoteTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Sales/Model/Order/Invoice/Total/TaxTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Service/DataObjectConverterTest.php rename dev/tests/unit/testsuite/Magento/{Core/Model => }/Session/ConfigTest.php (90%) create mode 100644 dev/tests/unit/testsuite/Magento/Shell/CommandRendererBackgroundTest.php create mode 100644 dev/tests/unit/testsuite/Magento/Shell/CommandRendererTest.php rename dev/tests/unit/testsuite/Magento/{Core => Store}/App/Action/Plugin/StoreCheckTest.php (87%) rename dev/tests/unit/testsuite/Magento/{Core => Store}/App/FrontController/Plugin/DispatchExceptionHandlerTest.php (89%) rename dev/tests/unit/testsuite/Magento/{Core => Store}/App/FrontController/Plugin/RequestPreprocessorTest.php (85%) rename dev/tests/unit/testsuite/Magento/{Core/App/Area => Store/App}/Request/PathInfoProcessorTest.php (87%) rename dev/tests/unit/testsuite/Magento/{Core => Store}/Block/SwitchTest.php (85%) rename dev/tests/unit/testsuite/Magento/{Core => Store}/Helper/CookieTest.php (75%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope/Store => Store/Model/Config}/ConverterTest.php (87%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Processor/PlaceholderTest.php (82%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/DefaultReaderTest.php (90%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope => Store/Model/Config/Reader}/ReaderPoolTest.php (54%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/StoreTest.php (74%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Config/Scope => Store/Model/Config}/Reader/WebsiteTest.php (87%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Store => Store/Model}/Storage/DefaultTest.php (86%) rename dev/tests/unit/testsuite/Magento/{Core/Model/Store => Store/Model}/StorageFactoryTest.php (59%) rename dev/tests/unit/testsuite/Magento/{Core => Store}/Model/StoreManagerTest.php (72%) create mode 100644 dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php rename dev/tests/unit/testsuite/Magento/{Core => Store}/Model/WebsiteTest.php (88%) create mode 100644 dev/tests/unit/testsuite/Magento/TranslateTest.php rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/Layout/ScheduledStructureTest.php (83%) rename dev/tests/unit/testsuite/Magento/{Core/Model => View}/LayoutTest.php (52%) create mode 100644 dev/tests/unit/testsuite/Magento/Weee/Helper/DataTest.php rename lib/{3Dsecure => CardinalCommerce}/CentinelClient.php (100%) rename lib/{3Dsecure => CardinalCommerce}/CentinelErrors.php (100%) rename lib/{3Dsecure => CardinalCommerce}/XMLParser.php (100%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/Base.php (91%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/BaseFactory.php (87%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/Element.php (92%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/FileResolver.php (98%) rename lib/Magento/App/{ConfigInterface.php => Config/MutableScopeConfigInterface.php} (72%) rename lib/Magento/App/{ => Config}/ReinitableConfigInterface.php (85%) rename lib/Magento/{Locale/ScopeConfigInterface.php => App/Config/Resource/ConfigInterface.php} (69%) rename app/code/Magento/Customer/Service/V1/Data/Search/FilterGroupInterface.php => lib/Magento/App/Config/ScopeConfigInterface.php (60%) rename app/code/Magento/Core/Model/Config/Storage/Db.php => lib/Magento/App/Config/Storage/Writer.php (74%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/Value.php (70%) rename {app/code/Magento/Core/Model => lib/Magento/App}/Config/ValueFactory.php (98%) create mode 100644 lib/Magento/App/MutableScopeConfig.php rename lib/Magento/{BaseScopeInterface.php => App/ScopeInterface.php} (95%) rename lib/Magento/{BaseScopeResolverInterface.php => App/ScopeResolverInterface.php} (91%) create mode 100644 lib/Magento/App/ScopeResolverPool.php create mode 100644 lib/Magento/Mail/TransportInterfaceFactory.php rename {app/code/Magento/Core/Model => lib/Magento}/Module/Output/Config.php (72%) create mode 100644 lib/Magento/Module/Setup.php rename {app/code/Magento/Core/Model/Resource => lib/Magento/Module}/Setup/Context.php (77%) rename {app/code/Magento/Core/Model/Resource => lib/Magento/Module}/Setup/Migration.php (89%) create mode 100644 lib/Magento/Module/Setup/MigrationData.php rename app/code/Magento/Core/Model/Session/Pool.php => lib/Magento/Module/Setup/MigrationFactory.php (56%) rename lib/Magento/{OSInfo.php => OsInfo.php} (99%) rename {app/code/Magento/Customer => lib/Magento}/Service/V1/Data/Filter.php (91%) rename {app/code/Magento/Customer => lib/Magento}/Service/V1/Data/FilterBuilder.php (90%) rename {app/code/Magento/Core/Model => lib/Magento}/Session/Config.php (92%) rename {app/code/Magento/Core/Model => lib/Magento}/Session/SidResolver.php (85%) rename {app/code/Magento/Core/Model => lib/Magento}/Session/Validator.php (85%) create mode 100644 lib/Magento/Shell/CommandRenderer.php create mode 100644 lib/Magento/Shell/CommandRendererBackground.php rename app/code/Magento/Core/Model/Store/Exception.php => lib/Magento/Shell/CommandRendererInterface.php (76%) create mode 100644 lib/Magento/ShellInterface.php create mode 100644 lib/Magento/View/Design/Theme/ResolverInterface.php rename app/code/Magento/Core/Block/Formkey.php => lib/Magento/View/Element/FormKey.php (80%) rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout.php (94%) rename app/code/Magento/Core/Model/StoreFactory.php => lib/Magento/View/Layout/Factory.php (72%) create mode 100644 lib/Magento/View/Layout/Proxy.php rename {app/code/Magento/Core/Model => lib/Magento/View}/Layout/ScheduledStructure.php (98%) delete mode 100644 lib/flex/uploader/uploader.mxml delete mode 100644 lib/flex/uploader/uploaderSingle.mxml delete mode 100644 lib/flex/varien/varien/upload/Uploader.as delete mode 100644 lib/flex/varien/varien/upload/UploaderEvent.as delete mode 100644 lib/flex/varien/varien/upload/UploaderSingle.as create mode 100644 pub/lib/images/logo.svg create mode 100644 pub/lib/jquery/handlebars/handlebars-v1.3.0.js create mode 100644 pub/lib/jquery/jquery-1.8.2.js create mode 100644 pub/lib/jquery/jquery-migrate.js create mode 100644 pub/lib/jquery/jquery-migrate.min.js create mode 100644 pub/lib/jquery/jquery-ui-1.9.2.js create mode 100644 pub/lib/jquery/jquery-ui.min.js create mode 100644 pub/lib/jquery/jquery.min.js create mode 100644 pub/lib/mage/loader_old.js rename dev/tests/unit/testsuite/Magento/Core/Model/Config/FileResolver/_files/primary/app/etc/some_config/di.xml => pub/lib/mage/tabs.js (89%) create mode 100644 pub/opt/magento/var/resource_config.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 88806577cdcb0..7abbad3509e7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,80 @@ +2.0.0.0-dev73 +============= +* Framework Improvements: + * Eliminated the StoreConfig class, and ability to work with Configuration through the Store object. Scope Config was introduced instead. + * Fixed performance degradation caused by DI argument processors + * Covered Magento library components with unit tests: + * Magento/App/Request + * Magento/App/Resource directory and Magento/App/Resource.php + * Magento/App/Response + * Magento/App/Route + * Magento/App/Router + * Magento/App/Http.php + * Magento/Translate.php + * Improved the Web API framework based on Customer Service + * Updated the API Service Exception Handling + * Changed the conventional notation of Vendor name in theme path: from `app/design//_` to `app/design///` + * Renamed the 3DSecure library to CardinalCommerce, and removed the unused flex library +* Themes update: + * Updated the look&feel of the Admin theme +* Modularity improvements: + * Introduced a new Store module. Moved all Store related logic from Magento_Core to Magento_Store + * Moved the library part of the Config component from the Magento_Core module to the library + * Moved the Session related logic from the Magento_Core module to the library + * Moved the abstract logic related to Magento "Module" from Magento_Core to the library + * Moved the form key related functionality to the library + * Introduced a new Magento_UrlRewrite module and moved related classes from Magento_Core to the new module + * Moved the resource model to Magento_Install module + * Eliminated the Core\Helper\Js class + * Moved the Email related logic from Magento_Core module to Magento_Email module + * Moved the Cache related logic from the Magento_Core module to the library + * Resolved issues which appeared when an order had been placed before the Magento_Payment module was disabled + * Eliminated Magento_Catalog dependency on Magento_Rating + * Removed the Magento_Rating module, its logic moved to Magento_Review + * Moved the View related components from Magento_Core to the Magento/View library +* Refactored the following modules to use Customer Service + * Magento_Multishipping + * Magento_Paypal + * Magento_Log + * Magento_RSS + * Magento_Review + * Magento_Wishlist + * Magento_Weee + * Magento_CatalogInventory + * Magento_CatalogRule + * Magento_SalesRule +* GitHub requests: + * [#520] (https://github.com/magento/magento2/issues/520) -- Fixed spelling in Magento\Payment\Model\Method\AbstractMethod + * [#481] (https://github.com/magento/magento2/issues/481) -- GD2 Adapter PHP memory_limit + * [#516] (https://github.com/magento/magento2/issues/516) -- Make Sure That save_before Event Is Dispatched + * [#465] (https://github.com/magento/magento2/issues/465) -- Absolute path is assembled incorrectly when merging js/css files + * [#504] (https://github.com/magento/magento2/issues/504) -- Renamed "contacts" module to "contact" + * [#529] (https://github.com/magento/magento2/issues/529) -- Fixed exception at admin dashboard + * [#535] (https://github.com/magento/magento2/issues/535) -- Fixed an issue during creating or editing product template + * [#535] (https://github.com/magento/magento2/issues/535) -- Fixed Typo in the module name + * [#538] (https://github.com/magento/magento2/issues/538) -- Fixed missing tax amount in the invoice + * [#518] (https://github.com/magento/magento2/issues/518) -- Change to Magento\Customer\Block\Widget\Dob new version +* Fixed bugs: + * Fixed implementation issues with Cron task group threading + * Fixed inability to place order during customer registration flow + * Fixed an issue where after JS minification errors appeared when loading pages which contained minified JS + * Fixed an issue where it was impossible for users with restricted permission to export certain entities + * Fixed an issue where checkout was blocked by the "Please enter the State/Province" pop-up for customers that had saved addresses + * Fixed an issue where a fatal error appeared when trying to check out the second time with OnePageCheckout + * Fixed an issue where a fatal error appeared when trying to create an online invoice for an order placed with PayPal Express Checkout (Payment Action = Order) + * Fixed an issue where the special price for a bundle product was calculated wrongly + * Fixed an issue where a fatal error appeared when trying to create a shipment for an order if Magento was installed without the USPS module + * Fixed an issue where the Lifetime Sales and Average Orders sections of the Admin Dashboard were missing + * Fixed an issue where the active tab changed after changing the attribute set + * Fixed an issue with incorrect order of product types in the Add Product menu in the backend + * Fixed an issue with saving the tier price attribute +* JavaScript improvements: + * Upgraded the frontend jQuery library to version 1.11 + * Upgraded the frontend jQuery UI library to version 1.10.4 + * Modified the loader widget to render content using handlebars + * Added the 'use strict' mode to the accordion widget + * Added the 'use strict' mode to the tab widget + 2.0.0.0-dev72 ============= * Framework Improvements: @@ -55,7 +132,7 @@ * Updated the whitelist filter with library code for integration tests code coverage calculation * GitHub requests: * [#512] (https://github.com/magento/magento2/issues/512) -- Theme Thumbnails not showing - * [#520] (https://github.com/magento/magento2/pull/502) -- Corrected Search Engine Optimization i18n + * [#520] (https://github.com/magento/magento2/pull/520) -- Corrected Search Engine Optimization i18n * [#519] (https://github.com/magento/magento2/issues/519) -- New Theme Activation * Customer Service usage: * Refactored the Log module to use Customer Service @@ -567,7 +644,7 @@ * Design loader moved to library * Theme label moved to library * Themes update: - * Reduced amount of templates and layouts in magento_plushe theme + * Reduced amount of templates and layouts in Magento/plushe theme * Responsive design improvements * Integrity improvements: * Covered all Magento classes with argument sequence validator diff --git a/app/code/Magento/AdminNotification/Block/Inbox.php b/app/code/Magento/AdminNotification/Block/Inbox.php index c87c86aaec5fb..637e3fdd8a279 100644 --- a/app/code/Magento/AdminNotification/Block/Inbox.php +++ b/app/code/Magento/AdminNotification/Block/Inbox.php @@ -38,15 +38,6 @@ protected function _construct() $this->_blockGroup = 'Magento_AdminNotification'; $this->_headerText = __('Messages Inbox'); parent::_construct(); - } - - /** - * @return $this - */ - protected function _prepareLayout() - { - parent::_prepareLayout(); $this->_removeButton('add'); - return $this; } } diff --git a/app/code/Magento/AdminNotification/Helper/Data.php b/app/code/Magento/AdminNotification/Helper/Data.php index ccf89de26aaa1..b49459a58bc28 100644 --- a/app/code/Magento/AdminNotification/Helper/Data.php +++ b/app/code/Magento/AdminNotification/Helper/Data.php @@ -65,9 +65,9 @@ class Data extends \Magento\App\Helper\AbstractHelper protected $_unreadNoticeCounts; /** - * @var \Magento\Core\Model\Store\Config + * @var \Magento\App\Config\ScopeConfigInterface */ - protected $_coreStoreConfig; + protected $_scopeConfig; /** * @var \Magento\AdminNotification\Model\InboxFactory @@ -76,16 +76,16 @@ class Data extends \Magento\App\Helper\AbstractHelper /** * @param \Magento\App\Helper\Context $context - * @param \Magento\Core\Model\Store\Config $coreStoreConfig + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory */ public function __construct( \Magento\App\Helper\Context $context, - \Magento\Core\Model\Store\Config $coreStoreConfig, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\AdminNotification\Model\InboxFactory $inboxFactory ) { parent::__construct($context); - $this->_coreStoreConfig = $coreStoreConfig; + $this->_scopeConfig = $scopeConfig; $this->_inboxFactory = $inboxFactory; } diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php index db68ab173b8cd..9e8974a816f4f 100644 --- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php +++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php @@ -31,31 +31,31 @@ class Baseurl implements \Magento\AdminNotification\Model\System\MessageInterfac protected $_urlBuilder; /** - * @var \Magento\App\ConfigInterface + * @var \Magento\App\Config\ScopeConfigInterface */ protected $_config; /** - * @var \Magento\Core\Model\StoreManagerInterface + * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; /** - * @var \Magento\Core\Model\Config\ValueFactory + * @var \Magento\App\Config\ValueFactory */ protected $_configValueFactory; /** - * @param \Magento\App\ConfigInterface $config - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\App\Config\ScopeConfigInterface $config + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\UrlInterface $urlBuilder - * @param \Magento\Core\Model\Config\ValueFactory $configValueFactory + * @param \Magento\App\Config\ValueFactory $configValueFactory */ public function __construct( - \Magento\App\ConfigInterface $config, - \Magento\Core\Model\StoreManagerInterface $storeManager, + \Magento\App\Config\ScopeConfigInterface $config, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\UrlInterface $urlBuilder, - \Magento\Core\Model\Config\ValueFactory $configValueFactory + \Magento\App\Config\ValueFactory $configValueFactory ) { $this->_urlBuilder = $urlBuilder; $this->_config = $config; @@ -71,18 +71,18 @@ public function __construct( protected function _getConfigUrl() { $output = ''; - $defaultUnsecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default'); + $defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default'); - $defaultSecure = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_SECURE_BASE_URL, 'default'); + $defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default'); - if ($defaultSecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER || - $defaultUnsecure == \Magento\Core\Model\Store::BASE_URL_PLACEHOLDER + if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER || + $defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ) { $output = $this->_urlBuilder->getUrl('adminhtml/system_config/edit', array('section' => 'web')); } else { /** @var $dataCollection \Magento\Core\Model\Resource\Config\Data\Collection */ $dataCollection = $this->_configValueFactory->create()->getCollection(); - $dataCollection->addValueFilter(\Magento\Core\Model\Store::BASE_URL_PLACEHOLDER); + $dataCollection->addValueFilter(\Magento\Store\Model\Store::BASE_URL_PLACEHOLDER); /** @var $data \Magento\App\Config\ValueInterface */ foreach ($dataCollection as $data) { diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php index d31b4237f1ac8..0b4b6861b3408 100644 --- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php +++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php @@ -54,7 +54,7 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa protected $_backendConfig; /** - * @var \Magento\App\ConfigInterface + * @var \Magento\App\Config\ScopeConfigInterface */ protected $_config; @@ -66,13 +66,13 @@ class Security implements \Magento\AdminNotification\Model\System\MessageInterfa /** * @param \Magento\App\CacheInterface $cache * @param \Magento\Backend\App\ConfigInterface $backendConfig - * @param \Magento\App\ConfigInterface $config + * @param \Magento\App\Config\ScopeConfigInterface $config * @param \Magento\HTTP\Adapter\CurlFactory $curlFactory */ public function __construct( \Magento\App\CacheInterface $cache, \Magento\Backend\App\ConfigInterface $backendConfig, - \Magento\App\ConfigInterface $config, + \Magento\App\Config\ScopeConfigInterface $config, \Magento\HTTP\Adapter\CurlFactory $curlFactory ) { $this->_cache = $cache; @@ -108,7 +108,7 @@ private function _canShowNotification() */ private function _isFileAccessible() { - $unsecureBaseURL = $this->_config->getValue(\Magento\Core\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default'); + $unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default'); /** @var $http \Magento\HTTP\Adapter\Curl */ $http = $this->_curlFactory->create(); diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/di.xml b/app/code/Magento/AdminNotification/etc/adminhtml/di.xml index e99780fbc95b4..833f39912e931 100644 --- a/app/code/Magento/AdminNotification/etc/adminhtml/di.xml +++ b/app/code/Magento/AdminNotification/etc/adminhtml/di.xml @@ -36,4 +36,11 @@ + + + + Magento_AdminNotification + + + diff --git a/app/code/Magento/AdminNotification/etc/module.xml b/app/code/Magento/AdminNotification/etc/module.xml index ec72a95860892..f70d9dab760e9 100644 --- a/app/code/Magento/AdminNotification/etc/module.xml +++ b/app/code/Magento/AdminNotification/etc/module.xml @@ -27,8 +27,10 @@ + + diff --git a/app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php b/app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php index 65bd8bf53a593..076d14fb56326 100644 --- a/app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php +++ b/app/code/Magento/AdminNotification/sql/adminnotification_setup/install-1.6.0.0.php @@ -32,7 +32,7 @@ * @author Magento Core Team */ $installer = $this; -/* @var $installer \Magento\Core\Model\Resource\Setup */ +/* @var $installer \Magento\Module\Setup */ $installer->startSetup(); /** diff --git a/app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php b/app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php index 1844643ec282e..08049ba1080bc 100644 --- a/app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php +++ b/app/code/Magento/AdminNotification/sql/adminnotification_setup/upgrade-1.6.0.0-2.0.0.0.php @@ -22,7 +22,7 @@ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) */ $installer = $this; -/* @var $installer \Magento\Core\Model\Resource\Setup */ +/* @var $installer \Magento\Module\Setup */ $installer->startSetup(); /** diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml index 124d63f3f1b82..7c7dbf54fa7b4 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml +++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml @@ -29,9 +29,9 @@ - - - + + + diff --git a/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js b/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js index a1327b2476c6c..a12271564c345 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js +++ b/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.js @@ -28,7 +28,7 @@ $(document).ready(function() { // Mark notification as read via AJAX call var markNotificationAsRead = function(notificationId) { - var requestUrl = $('.notifications .dropdown-menu').attr('data-mark-as-read-url'); + var requestUrl = $('.notifications-summary .dropdown-menu').attr('data-mark-as-read-url'); $.ajax({ url: requestUrl, type: 'POST', @@ -39,36 +39,36 @@ showLoader: false }); }; - var notificationCount = $('.notifications').attr('data-notification-count'); + var notificationCount = $('.notifications-summary').attr('data-notification-count'); // Remove notification from the list var removeNotificationFromList = function(notificationEntry) { notificationEntry.remove(); notificationCount--; - $('.notifications').attr('data-notification-count', notificationCount); + $('.notifications-summary').attr('data-notification-count', notificationCount); if (notificationCount == 0) { // Change appearance of the bubble and its behavior when the last notification is removed - $('.notifications .dropdown-menu').remove(); - var notificationIcon = $('.notifications .notifications-icon'); + $('.notifications-summary .dropdown-menu').remove(); + var notificationIcon = $('.notifications-summary .notifications-icon'); notificationIcon.removeAttr('data-toggle'); notificationIcon.off('click.dropdown'); - $('.notifications .notifications-icon .value').text(''); - $('.notifications .notifications-icon .value').hide(); + $('.notifications-action .counter').text(''); + $('.notifications-action .counter').hide(); } else { - $('.notifications .notifications-icon .value').text(notificationCount); + $('.notifications-action .counter').text(notificationCount); // Modify caption of the 'See All' link - var actionElement = $('.notifications .dropdown-menu .last .action-more'); + var actionElement = $('.notifications-summary .dropdown-menu .last .action-more'); actionElement.text(actionElement.text().replace(/\d+/, notificationCount)); } }; // Show popup with notification details var showNotificationDetails = function(notificationEntry) { - var popupElement = notificationEntry.find('.notification-dialog-content').clone(); + var popupElement = notificationEntry.find('.notifications-dialog-content').clone(); var notificationId = notificationEntry.attr('data-notification-id'); - var dialogClassSeverity = 'notification-entry-dialog'; + var dialogClassSeverity = 'notifications-entry-dialog'; if (notificationEntry.attr('data-notification-severity')) { - dialogClassSeverity = 'notification-entry-dialog notification-entry-dialog-critical'; + dialogClassSeverity = 'notifications-entry-dialog notifications-entry-dialog-critical'; } popupElement.dialog({ title: popupElement.attr('data-title'), @@ -99,16 +99,16 @@ }; // Show notification description when corresponding item is clicked - $('.notifications .dropdown-menu .notification-entry').on('click.showNotification', function(event) { + $('.notifications-summary .dropdown-menu .notifications-entry').on('click.showNotification', function(event) { // hide notification dropdown - $('.notifications .notifications-icon').trigger('click.dropdown'); + $('.notifications-summary .notifications-icon').trigger('click.dropdown'); showNotificationDetails($(this)); event.stopPropagation(); }); // Remove corresponding notification from the list and mark it as read - $('.notifications .dropdown-menu .notification-entry .action-close').on('click.removeNotification', function(event) { - var notificationEntry = $(this).closest('.notification-entry') + $('.notifications-close').on('click.removeNotification', function(event) { + var notificationEntry = $(this).closest('.notifications-entry') var notificationId = notificationEntry.attr('data-notification-id'); markNotificationAsRead(notificationId); removeNotificationFromList(notificationEntry); @@ -117,9 +117,9 @@ // Hide notifications bubble if (notificationCount == 0) { - $('.notifications .notifications-icon .value').hide(); + $('.notifications-action .counter').hide(); } else { - $('.notifications .notifications-icon .value').show(); + $('.notifications-action .counter').show(); } }); })(window.jQuery); diff --git a/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.phtml index b94db072282b4..71f33e8913f46 100644 --- a/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.phtml +++ b/app/code/Magento/AdminNotification/view/adminhtml/toolbar_entry.phtml @@ -26,38 +26,39 @@ ?> getUnreadNotificationCount(); ?> -
+
0) : ?> - - escapeHtml($notificationCount); ?> + + + escapeHtml($notificationCount); ?> -
    +
      getLatestUnreadNotifications() as $notification) : ?> -
    • - escapeHtml($notification->getTitle()); ?> - escapeHtml($notification->getDescription()); ?> - - -
      - escapeHtml($notification->getTitle()); ?> - escapeHtml($notification->getDescription()); ?> -
      - + escapeHtml($notification->getTitle()); ?> + escapeHtml($notification->getDescription()); ?> + + +
      + escapeHtml($notification->getTitle()); ?> + escapeHtml($notification->getDescription()); ?> +
      +
      - +
    • - +
    - - + +
diff --git a/app/code/Magento/Authorizenet/Helper/Backend.php b/app/code/Magento/Authorizenet/Helper/Backend.php index a35e66d6525c9..4909cc3243225 100644 --- a/app/code/Magento/Authorizenet/Helper/Backend.php +++ b/app/code/Magento/Authorizenet/Helper/Backend.php @@ -32,13 +32,13 @@ class Backend extends Data { /** * @param \Magento\App\Helper\Context $context - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Sales\Model\OrderFactory $orderFactory * @param \Magento\Backend\Model\UrlInterface $backendUrl */ public function __construct( \Magento\App\Helper\Context $context, - \Magento\Core\Model\StoreManagerInterface $storeManager, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Backend\Model\UrlInterface $backendUrl ) { diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php index a96f459a35f26..9b7fb737ccd8f 100644 --- a/app/code/Magento/Authorizenet/Helper/Data.php +++ b/app/code/Magento/Authorizenet/Helper/Data.php @@ -31,7 +31,7 @@ class Data extends \Magento\App\Helper\AbstractHelper implements HelperInterface { /** - * @var \Magento\Core\Model\StoreManagerInterface + * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -42,12 +42,12 @@ class Data extends \Magento\App\Helper\AbstractHelper implements HelperInterface /** * @param \Magento\App\Helper\Context $context - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Sales\Model\OrderFactory $orderFactory */ public function __construct( \Magento\App\Helper\Context $context, - \Magento\Core\Model\StoreManagerInterface $storeManager, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Sales\Model\OrderFactory $orderFactory ) { parent::__construct($context); diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php index 04ac998df3aaa..4dea7bf1e3040 100644 --- a/app/code/Magento/Authorizenet/Model/Authorizenet.php +++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php @@ -314,7 +314,7 @@ class Authorizenet extends \Magento\Payment\Model\Method\Cc /** * @param \Magento\Event\ManagerInterface $eventManager * @param \Magento\Payment\Helper\Data $paymentData - * @param \Magento\Core\Model\Store\Config $coreStoreConfig + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\Logger\AdapterFactory $logAdapterFactory * @param \Magento\Logger $logger * @param \Magento\Module\ModuleListInterface $moduleList @@ -333,7 +333,7 @@ class Authorizenet extends \Magento\Payment\Model\Method\Cc public function __construct( \Magento\Event\ManagerInterface $eventManager, \Magento\Payment\Helper\Data $paymentData, - \Magento\Core\Model\Store\Config $coreStoreConfig, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\Logger\AdapterFactory $logAdapterFactory, \Magento\Logger $logger, \Magento\Module\ModuleListInterface $moduleList, @@ -356,7 +356,7 @@ public function __construct( parent::__construct( $eventManager, $paymentData, - $coreStoreConfig, + $scopeConfig, $logAdapterFactory, $logger, $moduleList, diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php index fb2ced68a254f..3b4c40502256f 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost.php +++ b/app/code/Magento/Authorizenet/Model/Directpost.php @@ -71,7 +71,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet /**#@-*/ /** - * @var \Magento\Core\Model\StoreManagerInterface + * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -93,7 +93,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet /** * @param \Magento\Event\ManagerInterface $eventManager * @param \Magento\Payment\Helper\Data $paymentData - * @param \Magento\Core\Model\Store\Config $coreStoreConfig + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\Logger\AdapterFactory $logAdapterFactory * @param \Magento\Logger $logger * @param \Magento\Module\ModuleListInterface $moduleList @@ -105,7 +105,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet * @param \Magento\Sales\Model\OrderFactory $orderFactory * @param \Magento\Session\SessionManagerInterface $session * @param \Magento\Authorizenet\Helper\Data $authorizenetData - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\Sales\Model\QuoteFactory $quoteFactory * @param \Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory * @param \Magento\Authorizenet\Model\Directpost\Response $response @@ -117,7 +117,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet public function __construct( \Magento\Event\ManagerInterface $eventManager, \Magento\Payment\Helper\Data $paymentData, - \Magento\Core\Model\Store\Config $coreStoreConfig, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\Logger\AdapterFactory $logAdapterFactory, \Magento\Logger $logger, \Magento\Module\ModuleListInterface $moduleList, @@ -129,7 +129,7 @@ public function __construct( \Magento\Sales\Model\OrderFactory $orderFactory, \Magento\Session\SessionManagerInterface $session, \Magento\Authorizenet\Helper\Data $authorizenetData, - \Magento\Core\Model\StoreManagerInterface $storeManager, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Sales\Model\QuoteFactory $quoteFactory, \Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory, \Magento\Authorizenet\Model\Directpost\Response $response, @@ -139,7 +139,7 @@ public function __construct( parent::__construct( $eventManager, $paymentData, - $coreStoreConfig, + $scopeConfig, $logAdapterFactory, $logger, $moduleList, diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Observer.php b/app/code/Magento/Authorizenet/Model/Directpost/Observer.php index 0cf3d64840677..286c3c29981a4 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost/Observer.php +++ b/app/code/Magento/Authorizenet/Model/Directpost/Observer.php @@ -64,7 +64,7 @@ class Observer protected $_session; /** - * @var \Magento\Core\Model\StoreManagerInterface + * @var \Magento\Store\Model\StoreManagerInterface */ protected $_storeManager; @@ -74,7 +74,7 @@ class Observer * @param \Magento\Registry $coreRegistry * @param \Magento\Authorizenet\Model\Directpost $payment * @param \Magento\Authorizenet\Model\Directpost\Session $session - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager */ public function __construct( \Magento\Authorizenet\Helper\Data $authorizenetData, @@ -82,7 +82,7 @@ public function __construct( \Magento\Registry $coreRegistry, \Magento\Authorizenet\Model\Directpost $payment, \Magento\Authorizenet\Model\Directpost\Session $session, - \Magento\Core\Model\StoreManagerInterface $storeManager + \Magento\Store\Model\StoreManagerInterface $storeManager ) { $this->_coreRegistry = $coreRegistry; $this->_authorizenetData = $authorizenetData; diff --git a/app/code/Magento/Authorizenet/Model/Directpost/Session.php b/app/code/Magento/Authorizenet/Model/Directpost/Session.php index 659cab1f0dded..59d0884644c79 100644 --- a/app/code/Magento/Authorizenet/Model/Directpost/Session.php +++ b/app/code/Magento/Authorizenet/Model/Directpost/Session.php @@ -31,7 +31,7 @@ class Session extends \Magento\Session\SessionManager { /** - * @param \Magento\App\RequestInterface $request + * @param \Magento\App\Request\Http $request * @param \Magento\Session\SidResolverInterface $sidResolver * @param \Magento\Session\Config\ConfigInterface $sessionConfig * @param \Magento\Session\SaveHandlerInterface $saveHandler @@ -41,7 +41,7 @@ class Session extends \Magento\Session\SessionManager * @internal param array $data */ public function __construct( - \Magento\App\RequestInterface $request, + \Magento\App\Request\Http $request, \Magento\Session\SidResolverInterface $sidResolver, \Magento\Session\Config\ConfigInterface $sessionConfig, \Magento\Session\SaveHandlerInterface $saveHandler, diff --git a/app/code/Magento/Authorizenet/etc/module.xml b/app/code/Magento/Authorizenet/etc/module.xml index 30827b5f82e2c..2a1baabe9f32e 100644 --- a/app/code/Magento/Authorizenet/etc/module.xml +++ b/app/code/Magento/Authorizenet/etc/module.xml @@ -30,6 +30,7 @@ + diff --git a/app/code/Magento/Authz/Service/AuthorizationV1.php b/app/code/Magento/Authz/Service/AuthorizationV1.php index 85560afb42a0e..a2c4a65b594f0 100644 --- a/app/code/Magento/Authz/Service/AuthorizationV1.php +++ b/app/code/Magento/Authz/Service/AuthorizationV1.php @@ -27,8 +27,8 @@ use Magento\Acl; use Magento\Authz\Model\UserIdentifier; use Magento\Logger; -use Magento\Service\Exception as ServiceException; -use Magento\Service\ResourceNotFoundException; +use Magento\Webapi\ServiceException as ServiceException; +use Magento\Webapi\ServiceResourceNotFoundException; use Magento\User\Model\Resource\Role\CollectionFactory as RoleCollectionFactory; use Magento\User\Model\Resource\Rules\CollectionFactory as RulesCollectionFactory; use Magento\User\Model\Role; @@ -126,7 +126,7 @@ public function isAllowed($resources, UserIdentifier $userIdentifier = null) try { $role = $this->_getUserRole($userIdentifier); if (!$role) { - throw new ResourceNotFoundException( + throw new ServiceResourceNotFoundException( __( 'Role for user with ID "%1" and user type "%2" cannot be found.', $userIdentifier->getUserId(), diff --git a/app/code/Magento/Authz/Service/AuthorizationV1Interface.php b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php index dba4b3e1ac766..22769fa794db3 100644 --- a/app/code/Magento/Authz/Service/AuthorizationV1Interface.php +++ b/app/code/Magento/Authz/Service/AuthorizationV1Interface.php @@ -24,7 +24,7 @@ namespace Magento\Authz\Service; use Magento\Authz\Model\UserIdentifier; -use Magento\Service\Exception as ServiceException; +use Magento\Webapi\ServiceException as ServiceException; /** * Authorization service interface. diff --git a/app/code/Magento/Authz/etc/module.xml b/app/code/Magento/Authz/etc/module.xml index 1e2d85488113d..9c997c43014d5 100644 --- a/app/code/Magento/Authz/etc/module.xml +++ b/app/code/Magento/Authz/etc/module.xml @@ -29,7 +29,7 @@ - + diff --git a/app/code/Magento/Backend/App/Config.php b/app/code/Magento/Backend/App/Config.php index 506195f5c987c..6594641064240 100644 --- a/app/code/Magento/Backend/App/Config.php +++ b/app/code/Magento/Backend/App/Config.php @@ -51,7 +51,7 @@ public function __construct(\Magento\App\Config\ScopePool $scopePool) */ public function getValue($path) { - return $this->_scopePool->getScope('default', null)->getValue($path); + return $this->_scopePool->getScope(\Magento\App\ScopeInterface::SCOPE_DEFAULT, null)->getValue($path); } /** @@ -63,17 +63,7 @@ public function getValue($path) */ public function setValue($path, $value) { - $this->_scopePool->getScope('default', null)->setValue($path, $value); - } - - /** - * Reinitialize configuration - * - * @return void - */ - public function reinit() - { - $this->_scopePool->clean(); + $this->_scopePool->getScope(\Magento\App\ScopeInterface::SCOPE_DEFAULT, null)->setValue($path, $value); } /** @@ -84,6 +74,6 @@ public function reinit() */ public function isSetFlag($path) { - return !!$this->_scopePool->getScope('default', null)->getValue($path); + return !!$this->_scopePool->getScope(\Magento\App\ScopeInterface::SCOPE_DEFAULT, null)->getValue($path); } } diff --git a/app/code/Magento/Backend/App/ConfigInterface.php b/app/code/Magento/Backend/App/ConfigInterface.php index 0b124e5a1fb80..fe642439a366d 100644 --- a/app/code/Magento/Backend/App/ConfigInterface.php +++ b/app/code/Magento/Backend/App/ConfigInterface.php @@ -47,13 +47,6 @@ public function getValue($path); */ public function setValue($path, $value); - /** - * Reinitialize config object - * - * @return void - */ - public function reinit(); - /** * Retrieve config flag * diff --git a/app/code/Magento/Backend/App/Request/PathInfoProcessor.php b/app/code/Magento/Backend/App/Request/PathInfoProcessor.php index 13745a7473dbc..27760b6527729 100644 --- a/app/code/Magento/Backend/App/Request/PathInfoProcessor.php +++ b/app/code/Magento/Backend/App/Request/PathInfoProcessor.php @@ -33,16 +33,16 @@ class PathInfoProcessor implements \Magento\App\Request\PathInfoProcessorInterfa private $_helper; /** - * @var \Magento\Core\App\Request\PathInfoProcessor + * @var \Magento\Store\App\Request\PathInfoProcessor */ private $_subject; /** - * @param \Magento\Core\App\Request\PathInfoProcessor $subject + * @param \Magento\Store\App\Request\PathInfoProcessor $subject * @param \Magento\Backend\Helper\Data $helper */ public function __construct( - \Magento\Core\App\Request\PathInfoProcessor $subject, + \Magento\Store\App\Request\PathInfoProcessor $subject, \Magento\Backend\Helper\Data $helper ) { $this->_helper = $helper; diff --git a/app/code/Magento/Backend/App/Router/DefaultRouter.php b/app/code/Magento/Backend/App/Router/DefaultRouter.php index 8c234f0454dea..ba6ca3306d7e3 100644 --- a/app/code/Magento/Backend/App/Router/DefaultRouter.php +++ b/app/code/Magento/Backend/App/Router/DefaultRouter.php @@ -39,7 +39,7 @@ class DefaultRouter extends \Magento\Core\App\Router\Base protected $_url; /** - * @var \Magento\App\ConfigInterface + * @var \Magento\App\Config\ScopeConfigInterface */ protected $_coreConfig; @@ -58,11 +58,11 @@ class DefaultRouter extends \Magento\Core\App\Router\Base * @param \Magento\App\Route\ConfigInterface $routeConfig * @param \Magento\App\State $appState * @param \Magento\UrlInterface $url - * @param \Magento\Core\Model\StoreManagerInterface $storeManager - * @param \Magento\Core\Model\Store\Config $storeConfig + * @param \Magento\Store\Model\StoreManagerInterface $storeManager + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\Url\SecurityInfoInterface $urlSecurityInfo * @param string $routerId - * @param \Magento\App\ConfigInterface $coreConfig + * @param \Magento\App\Config\ScopeConfigInterface $coreConfig * @param \Magento\Backend\App\ConfigInterface $backendConfig * @param \Magento\Code\NameBuilder $nameBuilder * @@ -75,12 +75,12 @@ public function __construct( \Magento\App\Route\ConfigInterface $routeConfig, \Magento\App\State $appState, \Magento\UrlInterface $url, - \Magento\Core\Model\StoreManagerInterface $storeManager, - \Magento\Core\Model\Store\Config $storeConfig, + \Magento\Store\Model\StoreManagerInterface $storeManager, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\Url\SecurityInfoInterface $urlSecurityInfo, $routerId, \Magento\Code\NameBuilder $nameBuilder, - \Magento\App\ConfigInterface $coreConfig, + \Magento\App\Config\ScopeConfigInterface $coreConfig, \Magento\Backend\App\ConfigInterface $backendConfig ) { parent::__construct( @@ -91,7 +91,7 @@ public function __construct( $appState, $url, $storeManager, - $storeConfig, + $scopeConfig, $urlSecurityInfo, $routerId, $nameBuilder diff --git a/app/code/Magento/Backend/Block/Cache.php b/app/code/Magento/Backend/Block/Cache.php index da9c525623945..8b6c9cad6f81b 100644 --- a/app/code/Magento/Backend/Block/Cache.php +++ b/app/code/Magento/Backend/Block/Cache.php @@ -43,7 +43,7 @@ protected function _construct() array( 'label' => __('Flush Magento Cache'), 'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')', - 'class' => 'delete' + 'class' => 'primary flush-cache-magento' ) ); @@ -53,7 +53,7 @@ protected function _construct() array( 'label' => __('Flush Cache Storage'), 'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')', - 'class' => 'delete' + 'class' => 'flush-cache-storage' ) ); } diff --git a/app/code/Magento/Backend/Block/Context.php b/app/code/Magento/Backend/Block/Context.php index 235f2f10913c8..e2d11aae32e4c 100644 --- a/app/code/Magento/Backend/Block/Context.php +++ b/app/code/Magento/Backend/Block/Context.php @@ -47,7 +47,7 @@ class Context extends \Magento\View\Element\Context * @param \Magento\View\DesignInterface $design * @param \Magento\Session\SessionManagerInterface $session * @param \Magento\Session\SidResolverInterface $sidResolver - * @param \Magento\Core\Model\Store\Config $storeConfig + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\View\Url $viewUrl * @param \Magento\View\ConfigInterface $viewConfig * @param \Magento\App\Cache\StateInterface $cacheState @@ -70,7 +70,7 @@ public function __construct( \Magento\View\DesignInterface $design, \Magento\Session\SessionManagerInterface $session, \Magento\Session\SidResolverInterface $sidResolver, - \Magento\Core\Model\Store\Config $storeConfig, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\View\Url $viewUrl, \Magento\View\ConfigInterface $viewConfig, \Magento\App\Cache\StateInterface $cacheState, @@ -92,7 +92,7 @@ public function __construct( $design, $session, $sidResolver, - $storeConfig, + $scopeConfig, $viewUrl, $viewConfig, $cacheState, diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php index 2340fd9280423..8140865b63af9 100644 --- a/app/code/Magento/Backend/Block/Dashboard.php +++ b/app/code/Magento/Backend/Block/Dashboard.php @@ -52,7 +52,7 @@ protected function _prepareLayout() $this->addChild('topSearches', 'Magento\Backend\Block\Dashboard\Searches\Top'); - if ($this->_storeConfig->getConfig(self::XML_PATH_ENABLE_CHARTS)) { + if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) { $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams'); } else { $block = $this->getLayout()->createBlock( diff --git a/app/code/Magento/Backend/Block/Dashboard/Bar.php b/app/code/Magento/Backend/Block/Dashboard/Bar.php index 8ea931654504c..b1b67c956e4fd 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Bar.php +++ b/app/code/Magento/Backend/Block/Dashboard/Bar.php @@ -47,7 +47,7 @@ class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard /** * @return array */ - protected function getTotals() + public function getTotals() { return $this->_totals; } diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php index 634a0671d0983..3f79191b59bd9 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Graph.php +++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php @@ -86,14 +86,14 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard * * @var string */ - protected $_width = '587'; + protected $_width = '780'; /** * Chart height * * @var string */ - protected $_height = '300'; + protected $_height = '384'; /** * Google chart api data encoding @@ -213,9 +213,11 @@ public function getChartUrl($directUrl = true) { $params = array( 'cht' => 'lc', - 'chf' => 'bg,s,f4f4f4|c,lg,90,ffffff,0.1,ededed,0', - 'chm' => 'B,f4d4b2,0,0,0', - 'chco' => 'db4814' + 'chf' => 'bg,s,ffffff', + 'chco' => 'ef672f', + 'chls' => '7', + 'chxs' => '0,676056,15,0,l,676056|1,676056,15,0,l,676056', + 'chm' => 'h,f2ebde,0,0:1:.1,1,-1' ); $this->_allSeries = $this->getRowsData($this->_dataRows); @@ -224,7 +226,10 @@ public function getChartUrl($directUrl = true) $this->setAxisLabels($axis, $this->getRowsData($attr, true)); } - $timezoneLocal = $this->_storeConfig->getConfig($this->_localeDate->getDefaultTimezonePath()); + $timezoneLocal = $this->_scopeConfig->getValue( + $this->_localeDate->getDefaultTimezonePath(), + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange( $this->getDataHelper()->getParam('period'), @@ -270,10 +275,12 @@ public function getChartUrl($directUrl = true) */ if (count($dates) > 8 && count($dates) < 15) { $c = 1; - } else if (count($dates) >= 15) { - $c = 2; } else { - $c = 0; + if (count($dates) >= 15) { + $c = 2; + } else { + $c = 0; + } } /** * skipping some x labels for good reading @@ -355,7 +362,6 @@ public function getChartUrl($directUrl = true) $chartdata[] = $dataMissing . $dataDelimiter; } } - // END SIMPLE ENCODING } else { // EXTENDED ENCODING for ($j = 0; $j < sizeof($thisdataarray); $j++) { @@ -382,7 +388,6 @@ public function getChartUrl($directUrl = true) $chartdata[] = $dataMissing . $dataDelimiter; } } - // ============= END EXTENDED ENCODING ============= } $chartdata[] = $dataSetdelimiter; } @@ -436,18 +441,6 @@ public function getChartUrl($directUrl = true) $tmpstring = implode('|', $this->_axisLabels[$idx]); $valueBuffer[] = $indexid . ":|" . $tmpstring; - if (sizeof($this->_axisLabels[$idx]) > 1) { - $deltaX = 100 / (sizeof($this->_axisLabels[$idx]) - 1); - } else { - $deltaX = 100; - } - } else if ($idx == 'y') { - $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels); - if (sizeof($yLabels) - 1) { - $deltaY = 100 / (sizeof($yLabels) - 1); - } else { - $deltaY = 100; - } } $indexid++; } @@ -457,10 +450,6 @@ public function getChartUrl($directUrl = true) // chart size $params['chs'] = $this->getWidth() . 'x' . $this->getHeight(); - if (isset($deltaX) && isset($deltaY)) { - $params['chg'] = $deltaX . ',' . $deltaY . ',1,0'; - } - // return the encoded data if ($directUrl) { $p = array(); diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php index ada8974753116..ade17ef66738d 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Totals.php +++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php @@ -90,17 +90,21 @@ protected function _prepareLayout() if ($this->getRequest()->getParam('store')) { $collection->addFieldToFilter('store_id', $this->getRequest()->getParam('store')); - } else if ($this->getRequest()->getParam('website')) { - $storeIds = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'))->getStoreIds(); - $collection->addFieldToFilter('store_id', array('in' => $storeIds)); - } else if ($this->getRequest()->getParam('group')) { - $storeIds = $this->_storeManager->getGroup($this->getRequest()->getParam('group'))->getStoreIds(); - $collection->addFieldToFilter('store_id', array('in' => $storeIds)); - } elseif (!$collection->isLive()) { - $collection->addFieldToFilter( - 'store_id', - array('eq' => $this->_storeManager->getStore(\Magento\Core\Model\Store::ADMIN_CODE)->getId()) - ); + } else { + if ($this->getRequest()->getParam('website')) { + $storeIds = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'))->getStoreIds(); + $collection->addFieldToFilter('store_id', array('in' => $storeIds)); + } else { + if ($this->getRequest()->getParam('group')) { + $storeIds = $this->_storeManager->getGroup($this->getRequest()->getParam('group'))->getStoreIds(); + $collection->addFieldToFilter('store_id', array('in' => $storeIds)); + } elseif (!$collection->isLive()) { + $collection->addFieldToFilter( + 'store_id', + array('eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()) + ); + } + } } $collection->load(); diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php index e5ecdc3ea589c..76a00fb64c600 100644 --- a/app/code/Magento/Backend/Block/Page/Header.php +++ b/app/code/Magento/Backend/Block/Page/Header.php @@ -99,6 +99,6 @@ public function getLogoutLink() */ public function displayNoscriptNotice() { - return $this->_storeConfig->getConfig('web/browser_capabilities/javascript'); + return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); } } diff --git a/app/code/Magento/Backend/Block/Page/Locale.php b/app/code/Magento/Backend/Block/Page/Locale.php new file mode 100644 index 0000000000000..41d5165c51b11 --- /dev/null +++ b/app/code/Magento/Backend/Block/Page/Locale.php @@ -0,0 +1,110 @@ +_localeLists = $localeLists; + $this->_localeResolver = $localeResolver; + $this->_urlHelper = $urlHelper; + parent::__construct($context, $data); + } + + /** + * Prepare URL for change locale + * + * @return string + */ + public function getChangeLocaleUrl() + { + return $this->getUrl('adminhtml/index/changeLocale'); + } + + /** + * Prepare current URL for referer + * + * @return string + */ + public function getUrlForReferer() + { + return \Magento\App\Action\Action::PARAM_NAME_URL_ENCODED . '/' . $this->_urlHelper->getEncodedUrl(); + } + + /** + * Retrieve locale select element + * + * @return string + */ + public function getLocaleSelect() + { + $html = $this->getLayout()->createBlock('Magento\View\Element\Html\Select') + ->setName('locale') + ->setId('interface_locale') + ->setTitle(__('Interface Language')) + ->setClass('select locale-switcher-select') + ->setValue($this->_localeResolver->getLocale()->__toString()) + ->setOptions($this->_localeLists->getTranslatedOptionLocales()) + ->getHtml(); + + return $html; + } +} diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php index b67fade25eab4..9837ec92d33cd 100644 --- a/app/code/Magento/Backend/Block/Page/Notices.php +++ b/app/code/Magento/Backend/Block/Page/Notices.php @@ -42,7 +42,7 @@ class Notices extends \Magento\Backend\Block\Template */ public function displayNoscriptNotice() { - return $this->_storeConfig->getConfig('web/browser_capabilities/javascript'); + return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); } /** @@ -52,6 +52,6 @@ public function displayNoscriptNotice() */ public function displayDemoNotice() { - return $this->_storeConfig->getConfig('design/head/demonotice'); + return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE); } } diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php index 046da13141199..3445493185517 100644 --- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php +++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php @@ -39,24 +39,14 @@ class Reset extends \Magento\Backend\Block\System\Config\Form\Field */ const XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS = 'design/search_engine_robots/default_custom_instructions'; - /** - * Page robots - * - * @var \Magento\Theme\Helper\Robots - */ - protected $coreConfig; - /** * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\App\ConfigInterface $coreConfig * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, - \Magento\App\ConfigInterface $coreConfig, array $data = array() ) { - $this->coreConfig = $coreConfig; parent::__construct($context, $data); } @@ -78,7 +68,9 @@ protected function _construct() */ public function getRobotsDefaultCustomInstructions() { - return trim((string)$this->coreConfig->getValue(self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, 'default')); + return trim((string)$this->_scopeConfig->getValue( + self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, \Magento\App\ScopeInterface::SCOPE_DEFAULT + )); } /** diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php index 0b2a173451026..a79710eeaaccf 100644 --- a/app/code/Magento/Backend/Block/Store/Switcher.php +++ b/app/code/Magento/Backend/Block/Store/Switcher.php @@ -44,16 +44,30 @@ class Switcher extends \Magento\Backend\Block\Template const HINT_URL = 'http://www.magentocommerce.com/knowledge-base/entry/understanding-store-scopes'; /** - * @var array + * Name of website variable + * + * @var string */ - protected $_storeIds; + protected $_defaultWebsiteVarName = 'website'; + + /** + * Name of store group variable + * + * @var string + */ + protected $_defaultStoreGroupVarName = 'group'; /** * Name of store variable * * @var string */ - protected $_storeVarName = 'store'; + protected $_defaultStoreVarName = 'store'; + + /** + * @var array + */ + protected $_storeIds; /** * Url for store switcher hint @@ -77,36 +91,36 @@ class Switcher extends \Magento\Backend\Block\Template /** * Website factory * - * @var \Magento\Core\Model\Website\Factory + * @var \Magento\Store\Model\Website\Factory */ protected $_websiteFactory; /** * Store Group Factory * - * @var \Magento\Core\Model\Store\Group\Factory + * @var \Magento\Store\Model\Group\Factory */ protected $_storeGroupFactory; /** * Store Factory * - * @var \Magento\Core\Model\StoreFactory + * @var \Magento\Store\Model\StoreFactory */ protected $_storeFactory; /** * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Model\Website\Factory $websiteFactory - * @param \Magento\Core\Model\Store\Group\Factory $storeGroupFactory - * @param \Magento\Core\Model\StoreFactory $storeFactory + * @param \Magento\Store\Model\Website\Factory $websiteFactory + * @param \Magento\Store\Model\Group\Factory $storeGroupFactory + * @param \Magento\Store\Model\StoreFactory $storeFactory * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Model\Website\Factory $websiteFactory, - \Magento\Core\Model\Store\Group\Factory $storeGroupFactory, - \Magento\Core\Model\StoreFactory $storeFactory, + \Magento\Store\Model\Website\Factory $websiteFactory, + \Magento\Store\Model\Group\Factory $storeGroupFactory, + \Magento\Store\Model\StoreFactory $storeFactory, array $data = array() ) { parent::__construct($context, $data); @@ -124,11 +138,23 @@ protected function _construct() $this->setUseConfirm(true); $this->setUseAjax(true); - $this->setDefaultStoreName(__('All Store Views')); + + $this->setShowManageStoresLink(0); + + if (!$this->hasData('switch_websites')) { + $this->setSwitchWebsites(false); + } + if (!$this->hasData('switch_store_groups')) { + $this->setSwitchStoreGroups(false); + } + if (!$this->hasData('switch_store_views')) { + $this->setSwitchStoreViews(true); + } + $this->setDefaultSelectionName(__('All Store Views')); } /** - * @return \Magento\Core\Model\Resource\Website\Collection + * @return \Magento\Store\Model\Resource\Website\Collection */ public function getWebsiteCollection() { @@ -145,7 +171,7 @@ public function getWebsiteCollection() /** * Get websites * - * @return \Magento\Core\Model\Website[] + * @return \Magento\Store\Model\Website[] */ public function getWebsites() { @@ -161,12 +187,64 @@ public function getWebsites() } /** - * @param int|\Magento\Core\Model\Website $website - * @return \Magento\Core\Model\Resource\Store\Group\Collection + * Check if can switch to websites + * + * @return bool + */ + public function isWebsiteSwitchEnabled() + { + return (bool)$this->getData('switch_websites'); + } + + /** + * @param string $varName + * @return $this + */ + public function setWebsiteVarName($varName) + { + $this->setData('website_var_name', $varName); + return $this; + } + + /** + * @return string + */ + public function getWebsiteVarName() + { + if ($this->hasData('website_var_name')) { + return (string)$this->getData('website_var_name'); + } else { + return (string)$this->_defaultWebsiteVarName; + } + } + + /** + * @param \Magento\Store\Model\Website $website + * @return bool + */ + public function isWebsiteSelected(\Magento\Store\Model\Website $website) + { + return $this->getWebsiteId() === $website->getId() && $this->getStoreId() === null; + } + + /** + * @return int|null + */ + public function getWebsiteId() + { + if (!$this->hasData('website_id')) { + $this->setData('website_id', $this->getRequest()->getParam($this->getWebsiteVarName())); + } + return $this->getData('website_id'); + } + + /** + * @param int|\Magento\Store\Model\Website $website + * @return \Magento\Store\Model\Resource\Group\Collection */ public function getGroupCollection($website) { - if (!$website instanceof \Magento\Core\Model\Website) { + if (!$website instanceof \Magento\Store\Model\Website) { $website = $this->_websiteFactory->create()->load($website); } return $website->getGroupCollection(); @@ -175,24 +253,76 @@ public function getGroupCollection($website) /** * Get store groups for specified website * - * @param \Magento\Core\Model\Website|int $website + * @param \Magento\Store\Model\Website|int $website * @return array */ public function getStoreGroups($website) { - if (!$website instanceof \Magento\Core\Model\Website) { + if (!$website instanceof \Magento\Store\Model\Website) { $website = $this->_storeManager->getWebsite($website); } return $website->getGroups(); } /** - * @param \Magento\Core\Model\Store\Group|int $group - * @return \Magento\Core\Model\Resource\Store\Collection + * Check if can switch to store group + * + * @return bool + */ + public function isStoreGroupSwitchEnabled() + { + return (bool)$this->getData('switch_store_groups'); + } + + /** + * @param string $varName + * @return $this + */ + public function setStoreGroupVarName($varName) + { + $this->setData('store_group_var_name', $varName); + return $this; + } + + /** + * @return string + */ + public function getStoreGroupVarName() + { + if ($this->hasData('store_group_var_name')) { + return (string)$this->getData('store_group_var_name'); + } else { + return (string)$this->_defaultStoreGroupVarName; + } + } + + /** + * @param \Magento\Store\Model\Group $group + * @return bool + */ + public function isStoreGroupSelected(\Magento\Store\Model\Group $group) + { + return $this->getStoreGroupId() === $group->getId() && $this->getStoreGroupId() === null; + } + + /** + * @return int|null + */ + public function getStoreGroupId() + { + if (!$this->hasData('store_group_id')) { + $this->setData('store_group_id', $this->getRequest()->getParam($this->getStoreGroupVarName())); + } + return $this->getData('store_group_id'); + } + + /** + * @param \Magento\Store\Model\Group|int $group + * @return \Magento\Store\Model\Resource\Store\Collection */ public function getStoreCollection($group) { - if (!$group instanceof \Magento\Core\Model\Store\Group) { + if (!$group instanceof \Magento\Store\Model\Group) { $group = $this->_storeGroupFactory->create()->load($group); } $stores = $group->getStoreCollection(); @@ -206,12 +336,12 @@ public function getStoreCollection($group) /** * Get store views for specified store group * - * @param \Magento\Core\Model\Store\Group|int $group - * @return \Magento\Core\Model\Store[] + * @param \Magento\Store\Model\Group|int $group + * @return \Magento\Store\Model\Store[] */ public function getStores($group) { - if (!$group instanceof \Magento\Core\Model\Store\Group) { + if (!$group instanceof \Magento\Store\Model\Group) { $group = $this->_storeManager->getGroup($group); } $stores = $group->getStores(); @@ -226,14 +356,33 @@ public function getStores($group) } /** - * @return string + * @return int|null */ - public function getSwitchUrl() + public function getStoreId() { - if ($url = $this->getData('switch_url')) { - return $url; + if (!$this->hasData('store_id')) { + $this->setData('store_id', $this->getRequest()->getParam($this->getStoreVarName())); } - return $this->getUrl('*/*/*', array('_current' => true, $this->_storeVarName => null)); + return $this->getData('store_id'); + } + + /** + * @param \Magento\Store\Model\Store $store + * @return bool + */ + public function isStoreSelected(\Magento\Store\Model\Store $store) + { + return $this->getStoreId() !== null && (int)$this->getStoreId() === (int)$store->getId(); + } + + /** + * Check if can switch to store views + * + * @return bool + */ + public function isStoreSwitchEnabled() + { + return (bool)$this->getData('switch_store_views'); } /** @@ -242,32 +391,112 @@ public function getSwitchUrl() */ public function setStoreVarName($varName) { - $this->_storeVarName = $varName; + $this->setData('store_var_name', $varName); return $this; } /** - * Get current store + * @return mixed|string + */ + public function getStoreVarName() + { + if ($this->hasData('store_var_name')) { + return (string)$this->getData('store_var_name'); + } else { + return (string)$this->_defaultStoreVarName; + } + } + + /** + * @return string + */ + public function getSwitchUrl() + { + if ($url = $this->getData('switch_url')) { + return $url; + } + return $this->getUrl( + '*/*/*', + [ + '_current' => true, + $this->getStoreVarName() => null, + $this->getStoreGroupVarName() => null, + $this->getWebsiteVarName() => null, + ] + ); + } + + /** + * @return bool + */ + public function hasScopeSelected() + { + return $this->getStoreId() !== null || $this->getStoreGroupId() !== null || $this->getWebsiteId() !== null; + } + + /** + * Get current selection name * * @return string */ - public function getCurrentStoreName() + public function getCurrentSelectionName() { - $store = $this->_storeFactory->create(); - $store->load($this->getStoreId()); - if ($store->getId()) { - return $store->getName(); - } else { - return $this->getDefaultStoreName(); + if (!($name = $this->getCurrentStoreName())) { + if (!($name = $this->getCurrentStoreGroupName())) { + if (!($name = $this->getCurrentWebsiteName())) { + $name = $this->getDefaultSelectionName(); + } + } } + return $name; } /** - * @return int + * Get current website name + * + * @return string */ - public function getStoreId() + public function getCurrentWebsiteName() { - return $this->getRequest()->getParam($this->_storeVarName); + if ($this->getWebsiteId() !== null) { + $website = $this->_websiteFactory->create(); + $website->load($this->getWebsiteId()); + if ($website->getId()) { + return $website->getName(); + } + } + } + + /** + * Get current store group name + * + * @return string + */ + public function getCurrentStoreGroupName() + { + if ($this->getStoreGroupId() !== null) { + $group = $this->_storeGroupFactory->create(); + $group->load($this->getStoreGroupId()); + if ($group->getId()) { + return $group->getName(); + } + } + } + + /** + * Get current store view name + * + * @return string + */ + public function getCurrentStoreName() + { + if ($this->getStoreId() !== null) { + $store = $this->_storeFactory->create(); + $store->load($this->getStoreId()); + if ($store->getId()) { + return $store->getName(); + } + } } /** @@ -345,9 +574,9 @@ public function getHintHtml() $url ) . '"' . ' onclick="this.target=\'_blank\'"' . ' title="' . __( 'What is this?' - ) . '"' . ' class="link-store-scope">' . __( + ) . '"' . ' class="link-store-scope">' . __( 'What is this?' - ) . '' . '
'; + ) . '' . ' '; } return $html; } diff --git a/app/code/Magento/Backend/Block/System/Config/Dwstree.php b/app/code/Magento/Backend/Block/System/Config/Dwstree.php index 54791aa7ea1a5..ab13c3e2ecb40 100644 --- a/app/code/Magento/Backend/Block/System/Config/Dwstree.php +++ b/app/code/Magento/Backend/Block/System/Config/Dwstree.php @@ -60,7 +60,7 @@ public function initTabs() ) ); - /** @var $website \Magento\Core\Model\Website */ + /** @var $website \Magento\Store\Model\Website */ foreach ($this->_storeManager->getWebsites(true) as $website) { $wCode = $website->getCode(); $wName = $website->getName(); @@ -73,7 +73,7 @@ public function initTabs() $this->_addBreadcrumb($wName); } } - /** @var $store \Magento\Core\Model\Store */ + /** @var $store \Magento\Store\Model\Store */ foreach ($website->getStores() as $store) { $sCode = $store->getCode(); $sName = $store->getName(); diff --git a/app/code/Magento/Backend/Block/System/Config/Edit.php b/app/code/Magento/Backend/Block/System/Config/Edit.php index 5be60469ddf03..27023a62af53b 100644 --- a/app/code/Magento/Backend/Block/System/Config/Edit.php +++ b/app/code/Magento/Backend/Block/System/Config/Edit.php @@ -91,7 +91,7 @@ protected function _prepareLayout() $this->setTitle($section->getLabel()); $this->setHeaderCss($section->getHeaderCss()); - $this->addChild( + $this->getToolbar()->addChild( 'save_button', 'Magento\Backend\Block\Widget\Button', array( diff --git a/app/code/Magento/Backend/Block/System/Config/Form.php b/app/code/Magento/Backend/Block/System/Config/Form.php index 8f7fe731554cb..4635bc1f0e97b 100644 --- a/app/code/Magento/Backend/Block/System/Config/Form.php +++ b/app/code/Magento/Backend/Block/System/Config/Form.php @@ -116,13 +116,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic */ protected $_fieldFactory; - /** - * Form field factory - * - * @var \Magento\App\ConfigInterface - */ - protected $_config; - /** * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Registry $registry @@ -131,7 +124,6 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic * @param \Magento\Backend\Model\Config\Structure $configStructure * @param \Magento\Backend\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory * @param \Magento\Backend\Block\System\Config\Form\Field\Factory $fieldFactory - * @param \Magento\App\ConfigInterface $coreConfig * @param array $data */ public function __construct( @@ -142,7 +134,6 @@ public function __construct( \Magento\Backend\Model\Config\Structure $configStructure, \Magento\Backend\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory, \Magento\Backend\Block\System\Config\Form\Field\Factory $fieldFactory, - \Magento\App\ConfigInterface $coreConfig, array $data = array() ) { parent::__construct($context, $registry, $formFactory, $data); @@ -150,7 +141,6 @@ public function __construct( $this->_configStructure = $configStructure; $this->_fieldsetFactory = $fieldsetFactory; $this->_fieldFactory = $fieldFactory; - $this->_config = $coreConfig; $this->_scopeLabels = array( self::SCOPE_DEFAULT => __('[GLOBAL]'), @@ -477,7 +467,7 @@ protected function _generateElementId($path) */ public function getConfigValue($path) { - return $this->_config->getValue($path, $this->getScope(), $this->getScopeCode()); + return $this->_scopeConfig->getValue($path, $this->getScope(), $this->getScopeCode()); } /** diff --git a/app/code/Magento/Backend/Block/System/Config/Switcher.php b/app/code/Magento/Backend/Block/System/Config/Switcher.php index bafcd9194620c..274d0e885ab58 100644 --- a/app/code/Magento/Backend/Block/System/Config/Switcher.php +++ b/app/code/Magento/Backend/Block/System/Config/Switcher.php @@ -25,21 +25,26 @@ */ namespace Magento\Backend\Block\System\Config; +/** + * Class Switcher + * @package Magento\Backend\Block\System\Config + * @deprecated + */ class Switcher extends \Magento\Backend\Block\Template { /** - * @var \Magento\Core\Model\System\Store + * @var \Magento\Store\Model\System\Store */ protected $_systemStore; /** * @param \Magento\Backend\Block\Template\Context $context - * @param \Magento\Core\Model\System\Store $systemStore + * @param \Magento\Store\Model\System\Store $systemStore * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, - \Magento\Core\Model\System\Store $systemStore, + \Magento\Store\Model\System\Store $systemStore, array $data = array() ) { $this->_systemStore = $systemStore; @@ -91,8 +96,8 @@ public function getStoreSelectOptions() /** * Process website info * - * @param \Magento\Core\Model\System\Store $storeModel - * @param \Magento\Core\Model\Website $website + * @param \Magento\Store\Model\System\Store $storeModel + * @param \Magento\Store\Model\Website $website * @param string $section * @param string $curStore * @param string $curWebsite @@ -100,8 +105,8 @@ public function getStoreSelectOptions() * @return array */ protected function _processWebsite( - \Magento\Core\Model\System\Store $storeModel, - \Magento\Core\Model\Website $website, + \Magento\Store\Model\System\Store $storeModel, + \Magento\Store\Model\Website $website, $section, $curStore, $curWebsite, diff --git a/app/code/Magento/Backend/Block/System/Design.php b/app/code/Magento/Backend/Block/System/Design.php index dc3bbe0f1a6e5..00348970b4cac 100644 --- a/app/code/Magento/Backend/Block/System/Design.php +++ b/app/code/Magento/Backend/Block/System/Design.php @@ -34,13 +34,13 @@ protected function _prepareLayout() { $this->setTemplate('Magento_Backend::system/design/index.phtml'); - $this->addChild( + $this->getToolbar()->addChild( 'add_new_button', 'Magento\Backend\Block\Widget\Button', array( 'label' => __('Add Design Change'), 'onclick' => "setLocation('" . $this->getUrl('adminhtml/*/new') . "')", - 'class' => 'add' + 'class' => 'add primary add-design-change' ) ); diff --git a/app/code/Magento/Backend/Block/System/Design/Edit.php b/app/code/Magento/Backend/Block/System/Design/Edit.php index 8727b5dadf741..c5a476d5f3ccf 100644 --- a/app/code/Magento/Backend/Block/System/Design/Edit.php +++ b/app/code/Magento/Backend/Block/System/Design/Edit.php @@ -68,7 +68,7 @@ protected function _construct() */ protected function _prepareLayout() { - $this->addChild( + $this->getToolbar()->addChild( 'back_button', 'Magento\Backend\Block\Widget\Button', array( @@ -78,27 +78,32 @@ protected function _prepareLayout() ) ); - $this->addChild( + if ($this->getDesignChangeId()) { + $this->getToolbar()->addChild( + 'delete_button', + 'Magento\Backend\Block\Widget\Button', + array( + 'label' => __('Delete'), + 'onclick' => 'confirmSetLocation(\'' . __( + 'Are you sure?' + ) . '\', \'' . $this->getDeleteUrl() . '\')', + 'class' => 'delete' + ) + ); + } + + $this->getToolbar()->addChild( 'save_button', 'Magento\Backend\Block\Widget\Button', array( 'label' => __('Save'), - 'class' => 'save', + 'class' => 'save primary', 'data_attribute' => array( 'mage-init' => array('button' => array('event' => 'save', 'target' => '#design-edit-form')) ) ) ); - $this->addChild( - 'delete_button', - 'Magento\Backend\Block\Widget\Button', - array( - 'label' => __('Delete'), - 'onclick' => 'confirmSetLocation(\'' . __('Are you sure?') . '\', \'' . $this->getDeleteUrl() . '\')', - 'class' => 'delete' - ) - ); return parent::_prepareLayout(); } diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php index 5cbbdee0559ac..2582798da8f09 100644 --- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php +++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php @@ -33,7 +33,7 @@ class General extends \Magento\Backend\Block\Widget\Form\Generic protected $_labelFactory; /** - * @var \Magento\Core\Model\System\Store + * @var \Magento\Store\Model\System\Store */ protected $_systemStore; @@ -42,7 +42,7 @@ class General extends \Magento\Backend\Block\Widget\Form\Generic * @param \Magento\Registry $registry * @param \Magento\Data\FormFactory $formFactory * @param \Magento\View\Design\Theme\LabelFactory $labelFactory - * @param \Magento\Core\Model\System\Store $systemStore + * @param \Magento\Store\Model\System\Store $systemStore * @param array $data */ public function __construct( @@ -50,7 +50,7 @@ public function __construct( \Magento\Registry $registry, \Magento\Data\FormFactory $formFactory, \Magento\View\Design\Theme\LabelFactory $labelFactory, - \Magento\Core\Model\System\Store $systemStore, + \Magento\Store\Model\System\Store $systemStore, array $data = array() ) { $this->_labelFactory = $labelFactory; diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php index eb33604f39ef6..2573b7ee6c273 100644 --- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php +++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Group.php @@ -42,12 +42,12 @@ class Group extends \Magento\Backend\Block\System\Store\Edit\AbstractForm protected $_category; /** - * @var \Magento\Core\Model\StoreFactory + * @var \Magento\Store\Model\StoreFactory */ protected $_storeFactory; /** - * @var \Magento\Core\Model\Website\Factory + * @var \Magento\Store\Model\Website\Factory */ protected $_websiteFactory; @@ -56,8 +56,8 @@ class Group extends \Magento\Backend\Block\System\Store\Edit\AbstractForm * @param \Magento\Registry $registry * @param \Magento\Data\FormFactory $formFactory * @param \Magento\Catalog\Model\Config\Source\Category $category - * @param \Magento\Core\Model\StoreFactory $storeFactory - * @param \Magento\Core\Model\Website\Factory $websiteFactory + * @param \Magento\Store\Model\StoreFactory $storeFactory + * @param \Magento\Store\Model\Website\Factory $websiteFactory * @param array $data */ public function __construct( @@ -65,8 +65,8 @@ public function __construct( \Magento\Registry $registry, \Magento\Data\FormFactory $formFactory, \Magento\Catalog\Model\Config\Source\Category $category, - \Magento\Core\Model\StoreFactory $storeFactory, - \Magento\Core\Model\Website\Factory $websiteFactory, + \Magento\Store\Model\StoreFactory $storeFactory, + \Magento\Store\Model\Website\Factory $websiteFactory, array $data = array() ) { $this->_category = $category; diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php index 45a3e75b38c9d..cadd37eee18db 100644 --- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php +++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php @@ -37,12 +37,12 @@ class Store extends \Magento\Backend\Block\System\Store\Edit\AbstractForm { /** - * @var \Magento\Core\Model\Website\Factory + * @var \Magento\Store\Model\Website\Factory */ protected $_websiteFactory; /** - * @var \Magento\Core\Model\Store\Group\Factory + * @var \Magento\Store\Model\Group\Factory */ protected $_groupFactory; @@ -50,16 +50,16 @@ class Store extends \Magento\Backend\Block\System\Store\Edit\AbstractForm * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Registry $registry * @param \Magento\Data\FormFactory $formFactory - * @param \Magento\Core\Model\Store\Group\Factory $groupFactory - * @param \Magento\Core\Model\Website\Factory $websiteFactory + * @param \Magento\Store\Model\Group\Factory $groupFactory + * @param \Magento\Store\Model\Website\Factory $websiteFactory * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Registry $registry, \Magento\Data\FormFactory $formFactory, - \Magento\Core\Model\Store\Group\Factory $groupFactory, - \Magento\Core\Model\Website\Factory $websiteFactory, + \Magento\Store\Model\Group\Factory $groupFactory, + \Magento\Store\Model\Website\Factory $websiteFactory, array $data = array() ) { $this->_groupFactory = $groupFactory; diff --git a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php index 0f7bbd97ac738..dfe0e4f01d73c 100644 --- a/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php +++ b/app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php @@ -37,7 +37,7 @@ class Website extends \Magento\Backend\Block\System\Store\Edit\AbstractForm { /** - * @var \Magento\Core\Model\Store\GroupFactory + * @var \Magento\Store\Model\GroupFactory */ protected $_groupFactory; @@ -45,14 +45,14 @@ class Website extends \Magento\Backend\Block\System\Store\Edit\AbstractForm * @param \Magento\Backend\Block\Template\Context $context * @param \Magento\Registry $registry * @param \Magento\Data\FormFactory $formFactory - * @param \Magento\Core\Model\Store\GroupFactory $groupFactory + * @param \Magento\Store\Model\GroupFactory $groupFactory * @param array $data */ public function __construct( \Magento\Backend\Block\Template\Context $context, \Magento\Registry $registry, \Magento\Data\FormFactory $formFactory, - \Magento\Core\Model\Store\GroupFactory $groupFactory, + \Magento\Store\Model\GroupFactory $groupFactory, array $data = array() ) { $this->_groupFactory = $groupFactory; diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php index 4e5cae867ce9d..72d38eb32d8b9 100644 --- a/app/code/Magento/Backend/Block/System/Store/Store.php +++ b/app/code/Magento/Backend/Block/System/Store/Store.php @@ -65,8 +65,9 @@ protected function _prepareLayout() array( 'label' => __('Create Store'), 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/newGroup') . '\')', - 'class' => 'add' - ) + 'class' => 'add add-store' + ), + 1 ); /* Add Store button */ @@ -75,7 +76,7 @@ protected function _prepareLayout() array( 'label' => __('Create Store View'), 'onclick' => 'setLocation(\'' . $this->getUrl('adminhtml/*/newStore') . '\')', - 'class' => 'add' + 'class' => 'add add-store-view' ) ); diff --git a/app/code/Magento/Backend/Block/System/Variable/Edit.php b/app/code/Magento/Backend/Block/System/Variable/Edit.php index ba222ed1ead9a..dfc9a310bd3b8 100644 --- a/app/code/Magento/Backend/Block/System/Variable/Edit.php +++ b/app/code/Magento/Backend/Block/System/Variable/Edit.php @@ -109,8 +109,7 @@ public function getFormHtml() { $formHtml = parent::getFormHtml(); if (!$this->_storeManager->isSingleStoreMode() && $this->getVariable()->getId()) { - $storeSwitcher = $this->getLayout()->createBlock('Magento\Backend\Block\Store\Switcher')->toHtml(); - $formHtml = $storeSwitcher . $formHtml; + $formHtml = $formHtml; } return $formHtml; } diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php index 6e72d65ec20ee..879f149a19c02 100644 --- a/app/code/Magento/Backend/Block/Template.php +++ b/app/code/Magento/Backend/Block/Template.php @@ -96,7 +96,11 @@ public function isOutputEnabled($moduleName = null) if ($moduleName === null) { $moduleName = $this->getModuleName(); } - return !$this->_storeConfig->getConfigFlag('advanced/modules_disable_output/' . $moduleName); + + return !$this->_scopeConfig->isSetFlag( + 'advanced/modules_disable_output/' . $moduleName, + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ); } /** @@ -119,4 +123,14 @@ protected function _toHtml() $this->_eventManager->dispatch('adminhtml_block_html_before', array('block' => $this)); return parent::_toHtml(); } + + /** + * Return toolbar block instance + * + * @return bool|\Magento\View\Element\BlockInterface + */ + public function getToolbar() + { + return $this->getLayout()->getBlock('page.actions.toolbar'); + } } diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php index 7939d9d275b3e..6d979e3b9cc7d 100644 --- a/app/code/Magento/Backend/Block/Template/Context.php +++ b/app/code/Magento/Backend/Block/Template/Context.php @@ -62,9 +62,9 @@ class Context extends \Magento\View\Element\Template\Context * @param \Magento\TranslateInterface $translator * @param \Magento\App\CacheInterface $cache * @param \Magento\View\DesignInterface $design - * @param \Magento\Core\Model\Session $session + * @param \Magento\Session\Generic $session * @param \Magento\Session\SidResolverInterface $sidResolver - * @param \Magento\Core\Model\Store\Config $storeConfig + * @param \Magento\App\Config\ScopeConfigInterface $scopeConfig * @param \Magento\View\Url $viewUrl * @param \Magento\View\ConfigInterface $viewConfig * @param \Magento\App\Cache\StateInterface $cacheState @@ -77,7 +77,7 @@ class Context extends \Magento\View\Element\Template\Context * @param \Magento\View\FileSystem $viewFileSystem * @param \Magento\View\TemplateEnginePool $enginePool * @param \Magento\App\State $appState - * @param \Magento\Core\Model\StoreManagerInterface $storeManager + * @param \Magento\Store\Model\StoreManagerInterface $storeManager * @param \Magento\AuthorizationInterface $authorization * @param \Magento\Backend\Model\Session $backendSession * @param \Magento\Math\Random $mathRandom @@ -94,9 +94,9 @@ public function __construct( \Magento\TranslateInterface $translator, \Magento\App\CacheInterface $cache, \Magento\View\DesignInterface $design, - \Magento\Core\Model\Session $session, + \Magento\Session\Generic $session, \Magento\Session\SidResolverInterface $sidResolver, - \Magento\Core\Model\Store\Config $storeConfig, + \Magento\App\Config\ScopeConfigInterface $scopeConfig, \Magento\View\Url $viewUrl, \Magento\View\ConfigInterface $viewConfig, \Magento\App\Cache\StateInterface $cacheState, @@ -109,7 +109,7 @@ public function __construct( \Magento\View\FileSystem $viewFileSystem, \Magento\View\TemplateEnginePool $enginePool, \Magento\App\State $appState, - \Magento\Core\Model\StoreManagerInterface $storeManager, + \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\AuthorizationInterface $authorization, \Magento\Backend\Model\Session $backendSession, \Magento\Math\Random $mathRandom, @@ -131,7 +131,7 @@ public function __construct( $design, $session, $sidResolver, - $storeConfig, + $scopeConfig, $viewUrl, $viewConfig, $cacheState, @@ -151,7 +151,7 @@ public function __construct( /** * Get store manager * - * @return \Magento\Core\Model\StoreManagerInterface + * @return \Magento\Store\Model\StoreManagerInterface */ public function getStoreManager() { diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php b/app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php index bad9decfd3949..3d62f8cf2896c 100644 --- a/app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php +++ b/app/code/Magento/Backend/Block/Urlrewrite/Catalog/Edit/Form.php @@ -67,7 +67,7 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form * @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory * @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory * @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory - * @param \Magento\Core\Model\System\Store $systemStore + * @param \Magento\Store\Model\System\Store $systemStore * @param \Magento\Backend\Helper\Data $adminhtmlData * @param \Magento\Catalog\Model\ProductFactory $productFactory * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory @@ -83,7 +83,7 @@ public function __construct( \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory, \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory, \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory, - \Magento\Core\Model\System\Store $systemStore, + \Magento\Store\Model\System\Store $systemStore, \Magento\Backend\Helper\Data $adminhtmlData, \Magento\Catalog\Model\ProductFactory $productFactory, \Magento\Catalog\Model\CategoryFactory $categoryFactory, @@ -173,7 +173,7 @@ protected function _formPostInit($form) * Get catalog entity associated stores * * @return array - * @throws \Magento\Core\Model\Store\Exception + * @throws \Magento\Store\Model\Exception */ protected function _getEntityStores() { @@ -192,7 +192,7 @@ protected function _getEntityStores() } // @codingStandardsIgnoreStart if (!$entityStores) { - throw new \Magento\Core\Model\Store\Exception( + throw new \Magento\Store\Model\Exception( __( 'We can\'t set up a URL rewrite because the product you chose is not associated with a website.' ) @@ -202,7 +202,7 @@ protected function _getEntityStores() } elseif ($category->getId()) { $entityStores = (array)$category->getStoreIds(); if (!$entityStores) { - throw new \Magento\Core\Model\Store\Exception( + throw new \Magento\Store\Model\Exception( __( 'We can\'t set up a URL rewrite because the category your chose is not associated with a website.' ) diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php b/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php index 657d747c53e81..f4ebd00ac8658 100644 --- a/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php +++ b/app/code/Magento/Backend/Block/Urlrewrite/Cms/Page/Edit/Form.php @@ -60,7 +60,7 @@ class Form extends \Magento\Backend\Block\Urlrewrite\Edit\Form * @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory * @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory * @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory - * @param \Magento\Core\Model\System\Store $systemStore + * @param \Magento\Store\Model\System\Store $systemStore * @param \Magento\Backend\Helper\Data $adminhtmlData * @param \Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory * @param \Magento\Cms\Model\PageFactory $pageFactory @@ -75,7 +75,7 @@ public function __construct( \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory, \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory, \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory, - \Magento\Core\Model\System\Store $systemStore, + \Magento\Store\Model\System\Store $systemStore, \Magento\Backend\Helper\Data $adminhtmlData, \Magento\Cms\Model\Page\UrlrewriteFactory $urlRewriteFactory, \Magento\Cms\Model\PageFactory $pageFactory, @@ -148,7 +148,7 @@ protected function _formPostInit($form) * Get catalog entity associated stores * * @return array - * @throws \Magento\Core\Model\Store\Exception + * @throws \Magento\Store\Model\Exception */ protected function _getEntityStores() { @@ -161,7 +161,7 @@ protected function _getEntityStores() $this->_requireStoresFilter = !in_array(0, $entityStores); if (!$entityStores) { - throw new \Magento\Core\Model\Store\Exception( + throw new \Magento\Store\Model\Exception( __('Chosen cms page does not associated with any website.') ); } diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Edit.php b/app/code/Magento/Backend/Block/Urlrewrite/Edit.php index dc397d549d860..b8b2474c26c67 100644 --- a/app/code/Magento/Backend/Block/Urlrewrite/Edit.php +++ b/app/code/Magento/Backend/Block/Urlrewrite/Edit.php @@ -218,7 +218,7 @@ protected function _addSaveButton() 'save', array( 'label' => __('Save'), - 'class' => 'save', + 'class' => 'save primary save-url-redirect', 'level' => -1, 'data_attribute' => array( 'mage-init' => array('button' => array('event' => 'save', 'target' => '#edit_form')) diff --git a/app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php b/app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php index 5c00e1e87b489..4c5887dd15a3b 100644 --- a/app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php +++ b/app/code/Magento/Backend/Block/Urlrewrite/Edit/Form.php @@ -68,7 +68,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic protected $_adminhtmlData = null; /** - * @var \Magento\Core\Model\System\Store + * @var \Magento\Store\Model\System\Store */ protected $_systemStore; @@ -94,7 +94,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic * @param \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory * @param \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory * @param \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory - * @param \Magento\Core\Model\System\Store $systemStore + * @param \Magento\Store\Model\System\Store $systemStore * @param \Magento\Backend\Helper\Data $adminhtmlData * @param array $data * @@ -107,7 +107,7 @@ public function __construct( \Magento\UrlRewrite\Model\UrlRewrite\TypeProviderFactory $typesFactory, \Magento\UrlRewrite\Model\UrlRewrite\OptionProviderFactory $optionFactory, \Magento\UrlRewrite\Model\UrlRewriteFactory $rewriteFactory, - \Magento\Core\Model\System\Store $systemStore, + \Magento\Store\Model\System\Store $systemStore, \Magento\Backend\Helper\Data $adminhtmlData, array $data = array() ) { diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php index d47d4336a6668..8dd542df3f992 100644 --- a/app/code/Magento/Backend/Block/Widget/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Container.php @@ -87,10 +87,10 @@ protected function _construct() * @param array $data * @param integer $level * @param integer $sortOrder - * @param string|null $region That button should be displayed in ('header', 'footer', null) + * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null) * @return $this */ - protected function _addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'header') + protected function _addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar') { if (!isset($this->_buttons[$level])) { $this->_buttons[$level] = array(); @@ -118,10 +118,10 @@ protected function _addButton($buttonId, $data, $level = 0, $sortOrder = 0, $reg * @param array $data * @param integer $level * @param integer $sortOrder - * @param string|null $region That button should be displayed in ('header', 'footer', null) + * @param string|null $region That button should be displayed in ('toolbar', 'header', 'footer', null) * @return $this */ - public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'header') + public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar') { return $this->_addButton($buttonId, $data, $level, $sortOrder, $region); } @@ -208,7 +208,14 @@ protected function _prepareLayout() foreach ($buttons as $buttonId => $data) { $childId = $this->_prepareButtonBlockId($buttonId); $blockClassName = isset($data['class_name']) ? $data['class_name'] : null; - $this->_addButtonChildBlock($childId, $blockClassName); + $block = $this->_getButtonChildBlock($childId, $blockClassName); + if (isset($data['name'])) { + $data['element_name'] = $data['name']; + } + if ($block) { + $block->setData($data); + $this->_getButtonParentBlock($data['region'])->setChild($childId, $block); + } } } return parent::_prepareLayout(); @@ -225,6 +232,27 @@ protected function _prepareButtonBlockId($buttonId) return $buttonId . '_button'; } + /** + * Return button parent block. + * + * @param string $region + * @return \Magento\Backend\Block\Template + */ + protected function _getButtonParentBlock($region) + { + if (!$region || $region == 'header' || $region == 'footer') { + $parent = $this; + } elseif ($region == 'toolbar') { + $parent = $this->getLayout()->getBlock('page.actions.toolbar'); + } else { + $parent = $this->getLayout()->getBlock($region); + } + if ($parent) { + return $parent; + } + return $this; + } + /** * Adding child block with specified child's id. * @@ -232,14 +260,12 @@ protected function _prepareButtonBlockId($buttonId) * @param null|string $blockClassName * @return \Magento\Backend\Block\Widget */ - protected function _addButtonChildBlock($childId, $blockClassName = null) + protected function _getButtonChildBlock($childId, $blockClassName = null) { if (null === $blockClassName) { $blockClassName = 'Magento\Backend\Block\Widget\Button'; } - $block = $this->getLayout()->createBlock($blockClassName, $this->getNameInLayout() . '-' . $childId); - $this->setChild($childId, $block); - return $block; + return $this->getLayout()->createBlock($blockClassName, $this->getNameInLayout() . '-' . $childId); } /** @@ -254,23 +280,11 @@ public function getButtonsHtml($region = null) foreach ($this->_buttons as $buttons) { $_buttons = $this->_sortButtons($buttons); foreach ($_buttons as $button) { - $buttonId = $button['id']; $data = $button['data']; if ($region && isset($data['region']) && $region != $data['region']) { continue; } - $childId = $this->_prepareButtonBlockId($buttonId); - $child = $this->getChildBlock($childId); - - if (!$child) { - $blockClassName = isset($data['class_name']) ? $data['class_name'] : null; - $child = $this->_addButtonChildBlock($childId, $blockClassName); - } - if (isset($data['name'])) { - $data['element_name'] = $data['name']; - } - $child->setData($data); - + $childId = $this->_prepareButtonBlockId($button['id']); $out .= $this->getChildHtml($childId); } } diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php index da887970fe2f4..85a223c88f0c1 100644 --- a/app/code/Magento/Backend/Block/Widget/Form/Container.php +++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php @@ -82,7 +82,7 @@ protected function _construct() ); $this->_addButton( 'reset', - array('label' => __('Reset'), 'onclick' => 'setLocation(window.location.href)'), + array('label' => __('Reset'), 'onclick' => 'setLocation(window.location.href)', 'class' => 'reset'), -1 ); diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php index b11bf3d249647..cc66b359a2134 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php @@ -228,7 +228,12 @@ protected function _convertDate($date, $locale) $dateObj = $this->_localeDate->date(null, null, $locale, false); //set default timezone for store (admin) - $dateObj->setTimezone($this->_storeConfig->getConfig($this->_localeDate->getDefaultTimezonePath())); + $dateObj->setTimezone( + $this->_scopeConfig->getValue( + $this->_localeDate->getDefaultTimezonePath(), + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ) + ); //set beginning of day $dateObj->setHour(00); diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php index cf6b36c3459b5..1b90823bab02a 100644 --- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php +++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php @@ -60,7 +60,12 @@ public function getValue($index = null) $datetimeTo = $value['to']; //calculate end date considering timezone specification - $datetimeTo->setTimezone($this->_storeConfig->getConfig($this->_localeDate->getDefaultTimezonePath())); + $datetimeTo->setTimezone( + $this->_scopeConfig->getValue( + $this->_localeDate->getDefaultTimezonePath(), + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ) + ); $datetimeTo->addDay(1)->subSecond(1); $datetimeTo->setTimezone(\Magento\Stdlib\DateTime\TimezoneInterface::DEFAULT_TIMEZONE); } @@ -81,7 +86,12 @@ protected function _convertDate($date, $locale) $dateObj = $this->getLocaleDate()->date(null, null, $locale, false); //set default timezone for store (admin) - $dateObj->setTimezone($this->_storeConfig->getConfig($this->_localeDate->getDefaultTimezonePath())); + $dateObj->setTimezone( + $this->_scopeConfig->getValue( + $this->_localeDate->getDefaultTimezonePath(), + \Magento\Store\Model\ScopeInterface::SCOPE_STORE + ) + ); //set date with applying timezone of store $dateObj->set( @@ -120,32 +130,18 @@ public function getHtml() ); } - $html = '
' . - '
' . 'getUiId( 'filter', $this->_getHtmlName(), 'from' ) . '/>' . '
'; - $html .= '
' . - '' . ''; + $html .= ''; $html .= ' + - + diff --git a/app/code/Magento/Backend/view/adminhtml/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/admin/page.phtml index 58a927f5cd13b..5af0b981220ec 100644 --- a/app/code/Magento/Backend/view/adminhtml/admin/page.phtml +++ b/app/code/Magento/Backend/view/adminhtml/admin/page.phtml @@ -33,10 +33,12 @@ getBodyClass() ? ' class="' . $this->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'> -
+
getChildHtml('notification_window'); ?> getChildHtml('global_notices') ?> - getChildHtml('header') ?> +
+ getChildHtml('header') ?> +
getChildHtml('menu') ?> getChildHtml('notifications'); ?> @@ -45,7 +47,7 @@
getLayout()->getMessagesBlock()->getGroupedHtml() ?>
- + getChildHtml('page_main_actions'); ?> getChildHtml('left')): ?>
@@ -64,11 +66,10 @@ getChildHtml('js') ?> +
+ getChildHtml('footer') ?> +
- -
-
getChildHtml('footer') ?>
-
getChildHtml('before_body_end') ?>